Get builds working again when extension loading is not enabled. Ticket #1839. (CVS...

FossilOrigin-Name: 89ead80129ec934d2cb5f2447598a7253172f704

diff --git a/manifest b/manifest
index 0124af56f6172e6f5d859de87c7c04ae298d5534..742c2d6a57182e29078cb462a3f5bc5eb211fa01 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\ssimple\stest\scase\s(and\scorresponding\sbugfix)\sfor\sthe\svirtual\stable\sxConnect\sand\sxDisconnect\smethods.\s(CVS\s3214)
-D 2006-06-12T12:08:45
+C Get\sbuilds\sworking\sagain\swhen\sextension\sloading\sis\snot\senabled.\s\sTicket\s#1839.\s(CVS\s3215)
+D 2006-06-12T12:46:21
 F Makefile.in 56fd6261e83f60724e6dcd764e06ab68cbd53909
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -48,7 +48,7 @@ F src/hash.c 449f3d6620193aa557f5d86cbc5cc6b87702b185
 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
 F src/insert.c 2c3eeb4bcde13c1006824ef14953c2fdad31cf36
 F src/legacy.c fa15d505dd4e45044177ee4d1c6aeaf8c836d390
-F src/loadext.c 528a3c130ca32b83609593605ebeec235de4e55b
+F src/loadext.c d0fadf55c55144334a879a32e346c0204658e882
 F src/main.c f4397bf95216496e49db2153789788f4b1207b91
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 59f05de8c5777c34876607114a2fbe55ae578235
@@ -363,7 +363,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P bbeb93b5bb26ba83ee7b7ae439ca5ceebebac9a0
-R 3b9e31b36c1dc9a00f3889f306c0ed70
-U danielk1977
-Z 1c8aff829bac0910b18af9a0b5f547ac
+P b63dbc794795533f0bfd2d8e25633e6e3dea3ebd
+R 8640a1358a94d506d522af6b1245f46b
+U drh
+Z db019b0aec14966db17c4b9da5cd37eb

diff --git a/manifest.uuid b/manifest.uuid
index df5b779dee8b13f7efe469e137e7da3399236eb1..8106d5c05feddc3da219b7372f2a712f2e242a34 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b63dbc794795533f0bfd2d8e25633e6e3dea3ebd
\ No newline at end of file
+89ead80129ec934d2cb5f2447598a7253172f704
\ No newline at end of file

diff --git a/src/loadext.c b/src/loadext.c
index b0199b5c34a588fa7ac9f357a10e76756dbf2295..569c7235971ca2e7fa8cb914d2dfd4068ed81cd6 100644 (file)
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -280,11 +280,13 @@ int sqlite3_load_extension(
 ** to clean up loaded extensions
 */
 void sqlite3CloseExtensions(sqlite3 *db){
+#ifdef SQLITE_LIBRARY_TYPE
   int i;
   for(i=0; i<db->nExtension; i++){
     SQLITE_CLOSE_LIBRARY(((SQLITE_LIBRARY_TYPE*)db->aExtension)[i]);
   }
   sqliteFree(db->aExtension);
+#endif
 }
 
 #endif /* SQLITE_OMIT_LOAD_EXTENSION */