Work around issues with certain C++ compilers by adding a typedef

to sqlite3.h.  Ticket #2191. (CVS 3603)

FossilOrigin-Name: 31e8cf7f30afe14f0866ea71eebbda9755ddedf8

diff --git a/manifest b/manifest
index ebea4e52807f0b49a48fbdfc49af6ec5358e0018..1177b1da85e8a87384a0e9187b44c071db2825ad 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sadditional\sproblem\swith\sthe\sIS\sNULL\soptimization\son\sLEFT\sJOINs.\nTicket\s#2189.\s\sSee\salso\sticket\s#2177.\s(CVS\s3602)
-D 2007-01-25T16:56:07
+C Work\saround\sissues\swith\scertain\sC++\scompilers\sby\sadding\sa\stypedef\nto\ssqlite3.h.\s\sTicket\s#2191.\s(CVS\s3603)
+D 2007-01-26T00:51:44
 F Makefile.in 7fa74bf4359aa899da5586e394d17735f221315f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -95,7 +95,7 @@ F src/random.c 6119474a6f6917f708c1dee25b9a8e519a620e88
 F src/select.c 52f09127b53697b1a95835a9b0db9309cca8079f
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c d13ca007cd18192c07a668aeddcdd6a9fe639be9
-F src/sqlite.h.in d264fe6241fee33491b1ab90885c2f0c0d2c7e8f
+F src/sqlite.h.in 6b7383baf76070214f6381f603328ca9b22a7fae
 F src/sqlite3ext.h 011c75fd6459a61454514af07c7a4f1f5c767f27
 F src/sqliteInt.h f15bb7b1bcf750a3202bfae85d6d3beb4e5f64e1
 F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06
@@ -427,7 +427,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 310f68585188ae49b603af9bdef4ee7738ae37c0
-R 907eca9dc3d1d6e0a6d5d294c8ad8df3
+P 358dd82d3a921228155e2cf9e22aedd2b651ca9c
+R f3af1fd99835380ddbeceac31f2cde5a
 U drh
-Z 4ac8b3d88fe5dcdfe42a3ce7e4dec0ad
+Z 48d47de0ecf03ab88d6fead9735a7142

diff --git a/manifest.uuid b/manifest.uuid
index 4e6bbf4d7353909bff08ed905b626e2850dd76ca..fa9b28f302ee44bcec73296c9a5360edf14c7d4f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-358dd82d3a921228155e2cf9e22aedd2b651ca9c
\ No newline at end of file
+31e8cf7f30afe14f0866ea71eebbda9755ddedf8
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 568141f09ac5d052959bb3f176406384b629d033..7b698994155276a00f1a35dd5cc3e648df62c548 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.197 2007/01/10 12:57:29 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.198 2007/01/26 00:51:44 drh Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -1185,9 +1185,13 @@ void sqlite3_set_auxdata(sqlite3_context*, int, void*, void (*)(void*));
 ** SQLITE_TRANSIENT value means that the content will likely change in
 ** the near future and that SQLite should make its own private copy of
 ** the content before returning.
+**
+** The typedef is necessary to work around problems in certain
+** C++ compilers.  See ticket #2191.
 */
-#define SQLITE_STATIC      ((void(*)(void *))0)
-#define SQLITE_TRANSIENT   ((void(*)(void *))-1)
+typedef void (*sqlite3_destructor_type)(void*);
+#define SQLITE_STATIC      ((sqlite3_destructor_type)0)
+#define SQLITE_TRANSIENT   ((sqlite3_destructor_type)-1)
 
 /*
 ** User-defined functions invoke the following routines in order to