Fix naming conflict between sqlite.h and sqlite3.h. Ticket #946. (CVS 2007)

FossilOrigin-Name: 30370412630970a76aafb9715106911b716256db

diff --git a/manifest b/manifest
index cbd2cf802b23952d5e276e9b6da0ac7c87e75b63..9f4b85584c4efe4810b3b0b99659be2e1f3362a0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Convert\smany\sconstants\sto\shave\stype\s"const".\s(CVS\s2006)
-D 2004-10-06T15:41:16
+C Fix\snaming\sconflict\sbetween\ssqlite.h\sand\ssqlite3.h.\s\sTicket\s#946.\s(CVS\s2007)
+D 2004-10-06T15:52:01
 F Makefile.in 52c1cc106cad9148d4b7cb387b458e82dc86b339
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -61,7 +61,7 @@ F src/printf.c 7a92adc00b758cd5ce087dae80181a8bbdb70ed2
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c de51ec24aef0d5370819dac6c2613460effac42c
 F src/shell.c bfd23e7293f468587c94f8375dfa969ce5dcd253
-F src/sqlite.h.in 9bb76ff9e79ee72e6d529ff6ab1c252d513c3864
+F src/sqlite.h.in 4f97b5907acfd2a5068cb0cec9d5178816734db7
 F src/sqliteInt.h 610f25a92c0ce5edf40d12087c643c310e1d7d05
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
 F src/tclsqlite.c 0302e3f42f015d132d1291f3388c06e86c24a008
@@ -251,7 +251,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 4d0f29d54c0ccb153abd77d9b62b6461ec1e978f
-R aed3895fc7576a8a2f64715b3a8c183f
+P d790c84c5a889928d07f5394fffef0cbb8d5f214
+R b3cceebb7174bd299e79c0ff55d28308
 U drh
-Z 70d4afc62e3da4ed3b7339035a321351
+Z 97c46e1f9fc141789e84f32fa78ce4aa

diff --git a/manifest.uuid b/manifest.uuid
index ff5e11aa96b0574b286a9704c90c998de3f99e16..a52efb2e974fa13c6ab35cef3fed3e4a439e9f7d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d790c84c5a889928d07f5394fffef0cbb8d5f214
\ No newline at end of file
+30370412630970a76aafb9715106911b716256db
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index b9b5b681a03eff2355476c40d6aec4b211931605..c39dcdf5a8ef0021e0b8caa6399b2d4b37f66a31 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -12,7 +12,7 @@
 ** This header file defines the interface that the SQLite library
 ** presents to client programs.
 **
-** @(#) $Id: sqlite.h.in,v 1.120 2004/09/30 14:24:50 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.121 2004/10/06 15:52:01 drh Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -28,7 +28,11 @@ extern "C" {
 /*
 ** The version of the SQLite library.
 */
-#define SQLITE_VERSION         "--VERS--"
+#ifdef SQLITE_VERSION
+# undef SQLITE_VERSION
+#else
+# define SQLITE_VERSION         "--VERS--"
+#endif
 
 /*
 ** The version string is also compiled into the library so that a program
@@ -760,10 +764,22 @@ int sqlite3_data_count(sqlite3_stmt *pStmt);
 */
 #define SQLITE_INTEGER  1
 #define SQLITE_FLOAT    2
-#define SQLITE_TEXT     3
+/* #define SQLITE_TEXT  3  // See below */
 #define SQLITE_BLOB     4
 #define SQLITE_NULL     5
 
+/*
+** SQLite version 2 defines SQLITE_TEXT differently.  To allow both
+** version 2 and version 3 to be included, undefine them both if a
+** conflict is seen.  Define SQLITE3_TEXT to be the version 3 value.
+*/
+#ifdef SQLITE_TEXT
+# undef SQLITE_TEXT
+#else
+# define SQLITE_TEXT     3
+#endif
+#define SQLITE3_TEXT     3
+
 /*
 ** The next group of routines returns information about the information
 ** in a single column of the current result row of a query.  In every