diff options
| author | Neal H. Walfield <neal@g10code.com> | 2016-08-31 10:12:53 +0200 |
|---|---|---|
| committer | Neal H. Walfield <neal@g10code.com> | 2016-08-31 10:14:19 +0200 |
| commit | b8184d2d74e5ddd5eb68836b53fe5568110e14dd (patch) | |
| tree | bbb44074032074b176455ad75bbf1262862c4a4d /g10/gpgsql.h | |
| parent | gpg: Fix regression in gpgv's printing of the keyid. (diff) | |
| download | gnupg2-b8184d2d74e5ddd5eb68836b53fe5568110e14dd.tar.xz gnupg2-b8184d2d74e5ddd5eb68836b53fe5568110e14dd.zip | |
gpg: Avoid name spaces clash with future sqlite versions (2).
* g10/gpgsql.h (gpgsql_arg_type): Rename SQLITE_ARG_END to
GPGSQL_ARG_END, SQLITE_ARG_INT to GPGSQL_ARG_INT, SQLITE_ARG_LONG_LONG
to GPGSQL_ARG_LONG_LONG, SQLITE_ARG_STRING to GPGSQL_ARG_STRING, and
SQLITE_ARG_BLOB to GPGSQL_ARG_BLOB.
--
This commit completes the work started in b1ba460.
Signed-off-by: Neal H. Walfield <neal@g10code.com>
Diffstat (limited to 'g10/gpgsql.h')
| -rw-r--r-- | g10/gpgsql.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/g10/gpgsql.h b/g10/gpgsql.h index a540684eb..8117f4564 100644 --- a/g10/gpgsql.h +++ b/g10/gpgsql.h @@ -24,19 +24,19 @@ enum gpgsql_arg_type { - SQLITE_ARG_END = 0xdead001, - SQLITE_ARG_INT, - SQLITE_ARG_LONG_LONG, - SQLITE_ARG_STRING, + GPGSQL_ARG_END = 0xdead001, + GPGSQL_ARG_INT, + GPGSQL_ARG_LONG_LONG, + GPGSQL_ARG_STRING, /* This takes two arguments: the blob as a void * and the length of the blob as a long long. */ - SQLITE_ARG_BLOB + GPGSQL_ARG_BLOB }; int gpgsql_exec_printf (sqlite3 *db, - int (*callback)(void*,int,char**,char**), void *cookie, - char **errmsg, - const char *sql, ...); + int (*callback)(void*,int,char**,char**), void *cookie, + char **errmsg, + const char *sql, ...); typedef int (*gpgsql_stepx_callback) (void *cookie, /* number of columns. */ |