Fix more name collisions. Allow sqlite.h and sqlite3.h to both be included

in the same C/C++ source file. (CVS 1942)

FossilOrigin-Name: 23e5bed1c5062f0f639751f89873bf1a277547bd

diff --git a/manifest b/manifest
index f625e1f4cf35f8fd536b2e14bec300ead0f41bf5..de94f099677fc861a40276e544a64b0eb3c92b77 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\snaming\sconflict\sbetween\ssqlite\sversions\s2\sand\s3.\s\sAn\sopen\ssqlite3\nconnection\snow\s*must*\sbe\scalled\s"sqlite3".\s\sYou\scannot\scall\sit\s"sqlite".\nThis\smight\sbreak\sexisting\scode.\s(CVS\s1941)
-D 2004-09-06T17:24:12
+C Fix\smore\sname\scollisions.\s\sAllow\ssqlite.h\sand\ssqlite3.h\sto\sboth\sbe\sincluded\nin\sthe\ssame\sC/C++\ssource\sfile.\s(CVS\s1942)
+D 2004-09-06T17:34:13
 F Makefile.in 65a7c43fcaf9a710d62f120b11b6e435eeb4a450
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -39,7 +39,7 @@ F src/func.c 14bf20710a10fe66266e16da4364ca2dd8c4c36d
 F src/hash.c a97721a55440b7bea31ffe471bb2f6b4123cddd5
 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
 F src/insert.c bfd21070c28dd94e58ae918260a6985d2b5e4477
-F src/legacy.c 1cf9a326313f99879b4970a1d454725deb12e81b
+F src/legacy.c d58ea507bce885298a2c8c3cbb0f4bff5d47830b
 F src/main.c ac302ed646bdb256b78c87385627b3142357eced
 F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070
 F src/os.h d1780e0db95cad01f213d48da22ab490eb4fd345
@@ -60,7 +60,7 @@ F src/printf.c 17b28a1eedfe8129b05de981719306c18c3f1327
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c 6e3ec12a01c6d5b51459d6ddaca36040d9e7730e
 F src/shell.c 4f1a2760ced81c829defb47b0a3b61ffec61b604
-F src/sqlite.h.in 40c365c4af381fea8f103d579d4ce021c1b5fbc6
+F src/sqlite.h.in 8bdf3fc4c76040f939cb1831eb97babf6a2fa858
 F src/sqliteInt.h 0840e651db8e16f88f2b8a2393ac98dfdbf01df0
 F src/table.c 8168c6e824009f8485bff79fc60ea8fea6829b10
 F src/tclsqlite.c ad6460a22cee18f292614a083cd15db670298213
@@ -248,7 +248,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P dfa9ea89c473e1fea804ad07e8e58a9af1e92f6c
-R d6d5fe458835a0a28a6ff1bc8acf5454
+P 3ddf5a9d1c480a2e3aa32685879063b11afddbe1
+R 4e21ecb2dca1b0e6b2292d8785d52007
 U drh
-Z eb4e97b9a729a6f470349fc7f802efa6
+Z 6b0395c7e689562e57eb91318a8ed3d1

diff --git a/manifest.uuid b/manifest.uuid
index a7dffaa7fe627dc12897458fecba0c678f7f5343..f95ff803f022d79a9b3b6ce2d6475b22b8e9c7ec 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3ddf5a9d1c480a2e3aa32685879063b11afddbe1
\ No newline at end of file
+23e5bed1c5062f0f639751f89873bf1a277547bd
\ No newline at end of file

diff --git a/src/legacy.c b/src/legacy.c
index 3a93cb420cf7060cd80d9cd3a8c983d5ab54ec6c..a44af16ec31552b5cb20895a1d9cf5f62fdff1b9 100644 (file)
--- a/src/legacy.c
+++ b/src/legacy.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: legacy.c,v 1.6 2004/09/06 17:24:13 drh Exp $
+** $Id: legacy.c,v 1.7 2004/09/06 17:34:13 drh Exp $
 */
 
 #include "sqliteInt.h"
@@ -34,7 +34,7 @@
 int sqlite3_exec(
   sqlite3 *db,                /* The database on which the SQL executes */
   const char *zSql,           /* The SQL to be executed */
-  sqlite_callback xCallback,  /* Invoke this callback routine */
+  sqlite3_callback xCallback, /* Invoke this callback routine */
   void *pArg,                 /* First argument to xCallback() */
   char **pzErrMsg             /* Write error messages here */
 ){

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index cc506408b96c933ca7913073450787f9ddcb48e9..ae4ce197895a7b86a0458799273ab9738cd00c1b 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -12,10 +12,10 @@
 ** This header file defines the interface that the SQLite library
 ** presents to client programs.
 **
-** @(#) $Id: sqlite.h.in,v 1.117 2004/09/06 17:24:13 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.118 2004/09/06 17:34:13 drh Exp $
 */
-#ifndef _SQLITE_H_
-#define _SQLITE_H_
+#ifndef _SQLITE3_H_
+#define _SQLITE3_H_
 #include <stdarg.h>     /* Needed for the definition of va_list */
 
 /*
@@ -77,7 +77,7 @@ int sqlite3_close(sqlite3 *);
 /*
 ** The type for a callback function.
 */
-typedef int (*sqlite_callback)(void*,int,char**, char**);
+typedef int (*sqlite3_callback)(void*,int,char**, char**);
 
 /*
 ** A function to executes one or more statements of SQL.
@@ -120,9 +120,9 @@ typedef int (*sqlite_callback)(void*,int,char**, char**);
 ** and sqlite3_busy_timeout() functions below.)
 */
 int sqlite3_exec(
-  sqlite3*,                      /* An open database */
+  sqlite3*,                     /* An open database */
   const char *sql,              /* SQL to be executed */
-  sqlite_callback,              /* Callback function */
+  sqlite3_callback,             /* Callback function */
   void *,                       /* 1st argument to callback function */
   char **errmsg                 /* Error msg written here */
 );