Make sure the loadext.c module works even if all SQLITE_OMIT macros are

defined.  Tickets #2184 and #2069. (CVS 3604)

FossilOrigin-Name: e1fae43c89253fe5ca85bd149cd7697234f9aa91

diff --git a/manifest b/manifest
index 1177b1da85e8a87384a0e9187b44c071db2825ad..62ca0700433615280ac8c31ef1e43520d435bac9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-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
+C Make\ssure\sthe\sloadext.c\smodule\sworks\seven\sif\sall\sSQLITE_OMIT\smacros\sare\ndefined.\s\sTickets\s#2184\sand\s#2069.\s(CVS\s3604)
+D 2007-01-26T13:08:25
 F Makefile.in 7fa74bf4359aa899da5586e394d17735f221315f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -71,7 +71,7 @@ F src/hash.c 449f3d6620193aa557f5d86cbc5cc6b87702b185
 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
 F src/insert.c e9526ced19978a55687b55faea969b6ff2a53fb4
 F src/legacy.c 2631df6a861f830d6b1c0fe92b9fdd745b2c0cd6
-F src/loadext.c d7f0903ba15d7a713fc42943e72178cae8ad922b
+F src/loadext.c bbfdbf452c71b6f2723375478a365788498ec3cd
 F src/main.c 33c32014da3a1471e8869d2eba32b2c4314c39ce
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 59f05de8c5777c34876607114a2fbe55ae578235
@@ -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 358dd82d3a921228155e2cf9e22aedd2b651ca9c
-R f3af1fd99835380ddbeceac31f2cde5a
+P 31e8cf7f30afe14f0866ea71eebbda9755ddedf8
+R c4d7447c5dddc9c909ddd6d336d299b3
 U drh
-Z 48d47de0ecf03ab88d6fead9735a7142
+Z 3768f5eec85dfa8aa18c5475656cb57c

diff --git a/manifest.uuid b/manifest.uuid
index fa9b28f302ee44bcec73296c9a5360edf14c7d4f..1727363569de697fd94db6d341ade6851306923c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-31e8cf7f30afe14f0866ea71eebbda9755ddedf8
\ No newline at end of file
+e1fae43c89253fe5ca85bd149cd7697234f9aa91
\ No newline at end of file

diff --git a/src/loadext.c b/src/loadext.c
index 095dbcc21cb2a598ac90a428294c43712e37a863..6af99a6416ed8225173621c531a3b69cf750c341 100644 (file)
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -75,6 +75,20 @@
 # define sqlite3_declare_vtab 0
 #endif
 
+#ifdef SQLITE_OMIT_SHARED_CACHE
+# define sqlite3_enable_shared_cache 0
+#endif
+
+#ifdef SQLITE_OMIT_TRACE
+# define sqlite3_profile       0
+# define sqlite3_trace         0
+#endif
+
+#ifdef SQLITE_OMIT_GET_TABLE
+# define sqlite3_free_table    0
+# define sqlite3_get_table     0
+#endif
+
 /*
 ** The following structure contains pointers to all SQLite API routines.
 ** A pointer to this structure is passed into extensions when they are
@@ -154,7 +168,7 @@ const sqlite3_api_routines sqlite3_apis = {
   sqlite3_get_autocommit,
   sqlite3_get_auxdata,
   sqlite3_get_table,
-  sqlite3_global_recover,
+  0,     /* Was sqlite3_global_recover(), but that function is deprecated */
   sqlite3_interrupt,
   sqlite3_last_insert_rowid,
   sqlite3_libversion,