Changes to build successfully with -DSQLITE_OMIT_LOAD_EXTENSION=1 (CVS 3310)

FossilOrigin-Name: 783369e870df9d189fc75c98fa574fe4fc9843d0

diff --git a/manifest b/manifest
index 3c7d56fc5dc2758a8cb62114e3a2a851988340d5..516fb01115be49175bfea018ea2e85e836451453 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sso\sthat\sit\swill\sbuild\swith\sSQLITE_OMIT_VIRTUALTABLE=1.\s(CVS\s3309)
-D 2006-06-27T13:20:21
+C Changes\sto\sbuild\ssuccessfully\swith\s-DSQLITE_OMIT_LOAD_EXTENSION=1\s(CVS\s3310)
+D 2006-06-27T14:37:20
 F Makefile.in f839b470345d3cb4b0644068474623fe2464b5d3
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -74,7 +74,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c ad73192b30a338a58fe81183d4a5d5a1d4e51d36
 F src/sqlite.h.in af0ec0cfb2f8211e42cabf2523d1c8783f35ccaf
 F src/sqlite3ext.h c611255287e9a11ce4f1fe6251c2a0b9d32a828b
-F src/sqliteInt.h b82962553a49eea4cd5c35634c7c9e0c93700814
+F src/sqliteInt.h 3e3f9efa7f043f3b677a35652120092c5902dd3d
 F src/table.c e707e822aad688034d391b93df63d6b2d302fdca
 F src/tclsqlite.c 32d9e0147077f2e2c127c5f214fb3fe03ef97d18
 F src/test1.c d398aa0c2227b76696a249f0fb9a506e6e391928
@@ -374,7 +374,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 8a49311d2f50cf2ca24776cabcb8ec7418325cb1
-R 619d8ee8eb3496bd8b37cd0133ef301c
+P 5612b287059c75488f995625d447c4e9521d1637
+R 3722049afc5fc0079c432abf2589144f
 U drh
-Z 9dfba4054cb802f88e4ad625f3a30132
+Z 5ed9e00c9b5d8d18b3e6766a2179c4cd

diff --git a/manifest.uuid b/manifest.uuid
index 112d34b2f0f1c234f2f0097fc659b5719f3e7439..1ffc493d5260158102ec3e59a1721bad2d71a1d4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5612b287059c75488f995625d447c4e9521d1637
\ No newline at end of file
+783369e870df9d189fc75c98fa574fe4fc9843d0
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 468af0f7ced155ad76a52946de02178becf5269c..6a76acf5f3ea61025e047e51a4223e5629c15ecf 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.515 2006/06/27 01:54:26 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.516 2006/06/27 14:37:20 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1810,7 +1810,12 @@ int sqlite3MallocFailed(void);
 void sqlite3FailedMalloc(void);
 void sqlite3AbortOtherActiveVdbes(sqlite3 *, Vdbe *);
 int sqlite3OpenTempDatabase(Parse *);
-void sqlite3CloseExtensions(sqlite3*);
+
+#ifndef SQLITE_OMIT_LOAD_EXTENSION
+  void sqlite3CloseExtensions(sqlite3*);
+#else
+# define sqlite3CloseExtensions(X)
+#endif
 
 #ifndef SQLITE_OMIT_SHARED_CACHE
   void sqlite3TableLock(Parse *, int, int, u8, const char *);