From: drh <drh@noemail.net>
Date: Mon, 27 Oct 2014 20:14:02 +0000 (+0000)
Subject: Remove a small amount of unnecessary #ifdeffery from random.c.
X-Git-Tag: version-3.8.8~215
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d61a18a9f1493ed6ee2b6d12d7b4ca4621cc894b;p=thirdparty%2Fsqlite.git

Remove a small amount of unnecessary #ifdeffery from random.c.

FossilOrigin-Name: 2b9340c8684bc382391e02813e960b3166f24daa
---

diff --git a/manifest b/manifest
index 4a6bd095ba..31157b57d0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scompilation\sissue\swith\sMSVC\sdue\sto\sa\smisplaced\svariable\sdeclaration.
-D 2014-10-27T19:58:29.156
+C Remove\sa\ssmall\samount\sof\sunnecessary\s#ifdeffery\sfrom\srandom.c.
+D 2014-10-27T20:14:02.021
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -224,7 +224,7 @@ F src/pcache1.c e412cb585f777c840ddce0500eddc5c6043c2bb5
 F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f
 F src/prepare.c b7b7bf020bd4c962f7c8aed5a3c542c7dfe9f9c7
 F src/printf.c c31012ac23e458081df4a32634b60424e0cdfaf3
-F src/random.c f88232b90e308f58f1f8f10894d7a8a750d6f64d
+F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 4965007d6497b6a4d7a6d98751cc39712885f952
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c 428165951748151e87a15295b7357221433e311b
@@ -1207,7 +1207,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d33a1ff3aad0bfabf70a98ac338a68f82074e4fe
-R ee98bc34f841b6720302924cb59e4bc2
-U mistachkin
-Z 8119f44960013a2ca52459062580ce07
+P 9588b345d09daaa49d24d7fb6cab732e64e5474e
+R e26f0edef3def3003fae07f43e971e87
+U drh
+Z 3e6e6f10ca8455ff968ead5f51a9fff2
diff --git a/manifest.uuid b/manifest.uuid
index f68a004aea..11afc870ef 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9588b345d09daaa49d24d7fb6cab732e64e5474e
\ No newline at end of file
+2b9340c8684bc382391e02813e960b3166f24daa
\ No newline at end of file
diff --git a/src/random.c b/src/random.c
index bd109e71b3..179d01bef2 100644
--- a/src/random.c
+++ b/src/random.c
@@ -57,14 +57,12 @@ void sqlite3_randomness(int N, void *pBuf){
 
 #if SQLITE_THREADSAFE
   mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_PRNG);
-  sqlite3_mutex_enter(mutex);
 #endif
 
+  sqlite3_mutex_enter(mutex);
   if( N<=0 || pBuf==0 ){
     wsdPrng.isInit = 0;
-#if SQLITE_THREADSAFE
     sqlite3_mutex_leave(mutex);
-#endif
     return;
   }