Further changes to extension loading to support compile-time options.

FossilOrigin-Name: f818fb6f73ada64eaf8785d9bb2d439b6d755461

diff --git a/manifest b/manifest
index 49aea430a32bd5671d84ea35faccaf2d2b830794..7f9a5d2e6528bd2ce0f19acb3fb217ba16938a86 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Make\sAPIs\sadded\ssince\sversion\s3.6.0\saccessible\sto\sloadable\sextensions.
-D 2010-10-11T13:12:05
+C Further\schanges\sto\sextension\sloading\sto\ssupport\scompile-time\soptions.
+D 2010-10-11T17:57:42
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in b01fdfcfecf8a0716c29867a67959f6148b79961
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -142,7 +142,7 @@ F src/insert.c a4995747c062256582a90b4f87f716e11b067050
 F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
-F src/loadext.c a3e276c19545527116ee72c5fe3f20efea03ed3e
+F src/loadext.c 8af9fcc75708d60b88636ccba38b4a7b3c155c3e
 F src/main.c da74b2269470d97a702d2956eeeb691a5e3a68c3
 F src/malloc.c 3d7284cd9346ab6e3945535761e68c23c6cf40ef
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
@@ -876,14 +876,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 38bec827f1a0603ad36d1dc1bc83430ae370df38
-R 38c22a66befb43f7bd355826b118a4a3
+P 76c64a35567880b49af076df61c9fee76e934f14
+R 3693645cb9207011b4b4d6b807133849
 U drh
-Z 954d001875450ed8c3f608965f41e88c
+Z d4cde4cb275c9844545ecd2001936cd5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMsw0ooxKgR168RlERAhBlAJwLm6pZql1nAtpJpykn/5McubBGzgCgh6f3
-1HwXUMGcGCSYygVUckTLoSk=
-=mjo3
+iD8DBQFMs1AZoxKgR168RlERAvsVAKCHm3J0cQI5m65yj8b1GYxq7aNSLwCgi232
+DSksswjs4QYnMLeBmk6G8Ok=
+=IMTj
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 9c7579e1f3cea16ca197f4bcc54ae588dfed9712..271ac3bc0c99f773622aeea9eb932ef84da64b30 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-76c64a35567880b49af076df61c9fee76e934f14
\ No newline at end of file
+f818fb6f73ada64eaf8785d9bb2d439b6d755461
\ No newline at end of file

diff --git a/src/loadext.c b/src/loadext.c
index 8193618146ca2b52ee7dc9221e58307409eefdda..da2eec8c67471c25069b416956106c5be1b58062 100644 (file)
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -336,8 +336,13 @@ static const sqlite3_api_routines sqlite3Apis = {
   sqlite3_backup_pagecount,
   sqlite3_backup_remaining,
   sqlite3_backup_step,
+#ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
   sqlite3_compileoption_get,
   sqlite3_compileoption_used,
+#else
+  0,
+  0,
+#endif
   sqlite3_create_function_v2,
   sqlite3_db_config,
   sqlite3_db_mutex,
@@ -348,10 +353,20 @@ static const sqlite3_api_routines sqlite3Apis = {
   sqlite3_sourceid,
   sqlite3_stmt_status,
   sqlite3_strnicmp,
+#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
   sqlite3_unlock_notify,
+#else
+  0,
+#endif
+#ifndef SQLITE_OMIT_WAL
   sqlite3_wal_autocheckpoint,
   sqlite3_wal_checkpoint,
   sqlite3_wal_hook,
+#else
+  0,
+  0,
+  0,
+#endif
 };
 
 /*