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.c | |
| 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.c')
| -rw-r--r-- | g10/gpgsql.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/gpgsql.c b/g10/gpgsql.c index 72f51b5b7..a9b336485 100644 --- a/g10/gpgsql.c +++ b/g10/gpgsql.c @@ -131,25 +131,25 @@ gpgsql_stepx (sqlite3 *db, t = va_arg (va, enum gpgsql_arg_type); switch (t) { - case SQLITE_ARG_INT: + case GPGSQL_ARG_INT: { int value = va_arg (va, int); err = sqlite3_bind_int (stmt, i, value); break; } - case SQLITE_ARG_LONG_LONG: + case GPGSQL_ARG_LONG_LONG: { long long value = va_arg (va, long long); err = sqlite3_bind_int64 (stmt, i, value); break; } - case SQLITE_ARG_STRING: + case GPGSQL_ARG_STRING: { char *text = va_arg (va, char *); err = sqlite3_bind_text (stmt, i, text, -1, SQLITE_STATIC); break; } - case SQLITE_ARG_BLOB: + case GPGSQL_ARG_BLOB: { char *blob = va_arg (va, void *); long long length = va_arg (va, long long); @@ -170,7 +170,7 @@ gpgsql_stepx (sqlite3 *db, } t = va_arg (va, enum gpgsql_arg_type); - log_assert (t == SQLITE_ARG_END); + log_assert (t == GPGSQL_ARG_END); va_end (va); for (;;) |