From b8184d2d74e5ddd5eb68836b53fe5568110e14dd Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Wed, 31 Aug 2016 10:12:53 +0200 Subject: 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 --- g10/gpgsql.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'g10/gpgsql.h') 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. */ -- cgit v1.2.3