From: drh <drh@noemail.net>
Date: Thu, 30 Aug 2007 20:09:27 +0000 (+0000)
Subject: Fix the loadable extension module so that it will compile with
X-Git-Tag: version-3.6.10~1828
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad3e78b6718ec841d2082c9dec14359be23389ee;p=thirdparty%2Fsqlite.git

Fix the loadable extension module so that it will compile with
SQLITE_THREADSAFE=0. (CVS 4349)

FossilOrigin-Name: a73a8b50f76f4f948a4080070ac2354d8ea05515
---

diff --git a/manifest b/manifest
index 97c997d66b..447d752294 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sdiscrepency\sin\sthe\stest\spointed\sout\sby\sa\suser.\s\sWas\stesting\sfts2\s:-).\s(CVS\s4348)
-D 2007-08-30T20:01:33
+C Fix\sthe\sloadable\sextension\smodule\sso\sthat\sit\swill\scompile\swith\nSQLITE_THREADSAFE=0.\s(CVS\s4349)
+D 2007-08-30T20:09:28
 F Makefile.in bfcc303429a5d9dcd552d807ee016c77427418c3
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -98,7 +98,7 @@ F src/insert.c b11e5ca0d68bf2a7a56f47a052a0ee67dd4e2f89
 F src/journal.c 573911e274738b3fda813d4f0a6e319f8a9ecd36
 F src/legacy.c 4ac53191fad2e3c4d59bde1228879b2dc5a96d66
 F src/limits.h 71ab25f17e35e0a9f3f6f234b8ed49cc56731d35
-F src/loadext.c d13c65529df08fdcb57d563d05fa241455841fa2
+F src/loadext.c 9e6bbbc0955c882a2ef11c88d6a0896d2e7b02a4
 F src/main.c 9276bbdc90d17cd8b15c4cb227dc09c968779391
 F src/malloc.c de4e77fe70a9a0ac47a1c3a874422b107231bf31
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
@@ -568,7 +568,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P eee025024972852990e704253d1443c1cefb376c
-R 22bb7f489df69532356733d65729e11a
-U shess
-Z 9c84fe5ce7236ca1a106e01233a60397
+P 65c62ed85edd2cb3cf26f01fadf3b342c1e8a20f
+R 24707d1f16c4f01b815be9447025b12b
+U drh
+Z 13c6d55075c5cdd960d7fb6e3991b863
diff --git a/manifest.uuid b/manifest.uuid
index def469ab86..eaa4acff40 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-65c62ed85edd2cb3cf26f01fadf3b342c1e8a20f
\ No newline at end of file
+a73a8b50f76f4f948a4080070ac2354d8ea05515
\ No newline at end of file
diff --git a/src/loadext.c b/src/loadext.c
index 17b5411735..2f0e81f771 100644
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -258,11 +258,19 @@ const sqlite3_api_routines sqlite3_apis = {
   sqlite3_create_collation_v2,
   sqlite3_memory_highwater,
   sqlite3_memory_used,
+#ifdef SQLITE_MUTEX_NOOP
+  0, 
+  0, 
+  0,
+  0,
+  0,
+#else
   sqlite3_mutex_alloc,
   sqlite3_mutex_enter,
   sqlite3_mutex_free,
   sqlite3_mutex_leave,
   sqlite3_mutex_try,
+#endif
   sqlite3_open_v2,
   sqlite3_release_memory,
   sqlite3_result_error_nomem,