Make the sqlite3ext.h header file responsive to -DSQLITE_OMIT_LOAD_EXTENSION.

FossilOrigin-Name: 47a46a9fa4a96cdb96a20b6aec802661b1ee4598

diff --git a/manifest b/manifest
index cb7fa5924791608b5513682661784477becc0942..a73e1f29f1f890fde14735513708747702ec4ea4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\stests\sfor\sjson_each()\sand\sjson_tree()\son\sbuilds\swhere\nvirtual\stables\sare\snot\ssupported
-D 2015-09-10T15:22:35.046
+C Make\sthe\ssqlite3ext.h\sheader\sfile\sresponsive\sto\s-DSQLITE_OMIT_LOAD_EXTENSION.
+D 2015-09-10T15:24:27.984
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -343,7 +343,7 @@ F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2
 F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
 F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
-F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
+F src/sqlite3ext.h 5088f0b63491677da848c0d07d5711781302d362
 F src/sqliteInt.h 788dc0ea7ba32ec9fec06c628c1792d7b4753d86
 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
 F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
@@ -1384,7 +1384,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9ecf684dfe0cd7e3b058d208aca7eb600bf1d21b
-R d6180d648d1042cce846185220b94bc9
+P bb8ee3b140a0a8b7c89f5debf22369f204ceef0b
+R 9f03517d27368f0ee452371692eeb689
 U drh
-Z 9344fe97d94688fb2bfac0fb4d626f52
+Z 40738b9489636e13edf984d114f41f8e

diff --git a/manifest.uuid b/manifest.uuid
index bf4050429c32a7e7c0e5eb990d746e5a467818a6..54212ec5b77d8f2f426352432498501b34ce1591 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bb8ee3b140a0a8b7c89f5debf22369f204ceef0b
\ No newline at end of file
+47a46a9fa4a96cdb96a20b6aec802661b1ee4598
\ No newline at end of file

diff --git a/src/sqlite3ext.h b/src/sqlite3ext.h
index 1525327f499888cd5d4dd84da8fcfc4fac8b0f09..9c01241a12aa85955c0c4e00fd26f0b92450419e 100644 (file)
--- a/src/sqlite3ext.h
+++ b/src/sqlite3ext.h
@@ -285,7 +285,7 @@ struct sqlite3_api_routines {
 ** the API.  So the redefinition macros are only valid if the
 ** SQLITE_CORE macros is undefined.
 */
-#ifndef SQLITE_CORE
+#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
 #define sqlite3_aggregate_context      sqlite3_api->aggregate_context
 #ifndef SQLITE_OMIT_DEPRECATED
 #define sqlite3_aggregate_count        sqlite3_api->aggregate_count
@@ -508,9 +508,9 @@ struct sqlite3_api_routines {
 #define sqlite3_value_free             sqlite3_api->value_free
 #define sqlite3_result_zeroblob64      sqlite3_api->result_zeroblob64
 #define sqlite3_bind_zeroblob64        sqlite3_api->bind_zeroblob64
-#endif /* SQLITE_CORE */
+#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
 
-#ifndef SQLITE_CORE
+#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
   /* This case when the file really is being compiled as a loadable 
   ** extension */
 # define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api=0;