diff options
| author | Werner Koch <wk@gnupg.org> | 2016-05-21 20:06:59 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-05-21 20:06:59 +0200 |
| commit | b1ba460d8f3358342c2ee2927114d36e767a439f (patch) | |
| tree | 6f6e61e8b8ac5dcff7b1f3bb8dbc4feae8fe21d8 /g10/Makefile.am | |
| parent | gpg: Explicitly close a combined Tofu DB. (diff) | |
| download | gnupg2-b1ba460d8f3358342c2ee2927114d36e767a439f.tar.xz gnupg2-b1ba460d8f3358342c2ee2927114d36e767a439f.zip | |
gpg: Avoid name spaces clash with future sqlite versions.
* g10/sqlite.c: Rename to gpgsql.c. Change function prefixes to
gpgsql_.
* g10/sqlite.h: Rename to gpgsql.h.
* g10/tofu.c: Adjust for changes.
--
We used for our own extensions symbols with an sqlite_ names prefix.
This may in theory lead to duplicated symbols but more important, it
is harder to understand what is from gpg and what is from libsqlite.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/Makefile.am')
| -rw-r--r-- | g10/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/Makefile.am b/g10/Makefile.am index 18a1b69b8..fc33e838f 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -74,7 +74,7 @@ trust_source = trustdb.c trustdb.h tdbdump.c tdbio.c tdbio.h endif if USE_TOFU -tofu_source = tofu.h tofu.c sqlite.c sqlite.h +tofu_source = tofu.h tofu.c gpgsql.c gpgsql.h else tofu_source = endif |