#ifdef out unused static function mutexIsNT(). Ticket #3481. (CVS 5875)

FossilOrigin-Name: 239186804c7541abc512da33bba8f6fc7d24a374

diff --git a/manifest b/manifest
index 52ea2dff2ca1f3ec35638c204e7cc6214ea71b4e..2075c63968b6c36965d5ea4efb089e03f53c8c4c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updated\scomment\sin\ssource.\s\sTicket\s#3453.\s(CVS\s5874)
-D 2008-11-10T19:24:38
+C #ifdef\sout\sunused\sstatic\sfunction\smutexIsNT().\s\sTicket\s#3481.\s(CVS\s5875)
+D 2008-11-10T20:01:41
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 48172b58e444a9725ec482e0c022a564749acab4
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -131,7 +131,7 @@ F src/mutex.h 9e686e83a88838dac8b9c51271c651e833060f1e
 F src/mutex_noop.c 0004efdbc2fd48d261d5b3416fe537e888c79a54
 F src/mutex_os2.c 9c5637aa4c307c552566d0f0b3bd206245b54a97
 F src/mutex_unix.c 29049a61755cccddb2ee53904e6906bb7674223c
-F src/mutex_w32.c f0d21ff1f6981e5aedc56796adf3a347423ef736
+F src/mutex_w32.c 017b522f63ef09b834fefc9daa876c9ec167e7b5
 F src/os.c 0b411644b87ad689d7250bbfd1834d99b81a3df4
 F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
@@ -654,7 +654,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P fc36f2fc45b2d319ef0be97e1af1748d3e862690
-R ce58f3b04b0a351d5b10e989b8c3d40c
+P 83caa22087bcaa184eff559971262e4d7eecd0e0
+R 6e97ab19a3e294a77808d5b4d3a2dadc
 U shane
-Z 50375b72b5602010a56aef20b01d8290
+Z a00fa6ed5b6e3191d2c1a58f9c574997

diff --git a/manifest.uuid b/manifest.uuid
index 4a49fa325a7aac57c04d34de33a2b866fe75de37..ad8da125e3bad21128a0b57bec9c8867fb7728a7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-83caa22087bcaa184eff559971262e4d7eecd0e0
\ No newline at end of file
+239186804c7541abc512da33bba8f6fc7d24a374
\ No newline at end of file

diff --git a/src/mutex_w32.c b/src/mutex_w32.c
index d72f0a37078f96b5485827bde7408bcb527b2625..0d93811093684153d8a6a721293e718adca5c013 100644 (file)
--- a/src/mutex_w32.c
+++ b/src/mutex_w32.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains the C functions that implement mutexes for win32
 **
-** $Id: mutex_w32.c,v 1.11 2008/06/26 10:41:19 danielk1977 Exp $
+** $Id: mutex_w32.c,v 1.12 2008/11/10 20:01:41 shane Exp $
 */
 #include "sqliteInt.h"
 
@@ -41,7 +41,14 @@ struct sqlite3_mutex {
 ** this routine is used to determine if the host is Win95/98/ME or
 ** WinNT/2K/XP so that we will know whether or not we can safely call
 ** the LockFileEx() API.
+**
+** mutexIsNT() is only used for the TryEnterCriticalSection() API call,
+** which is only available if your application was compiled with 
+** _WIN32_WINNT defined to a value >= 0x0400.  Currently, the only
+** call to TryEnterCriticalSection() is #ifdef'ed out, so #ifdef 
+** this out as well.
 */
+#if 0
 #if SQLITE_OS_WINCE
 # define mutexIsNT()  (1)
 #else
@@ -56,7 +63,7 @@ struct sqlite3_mutex {
     return osType==2;
   }
 #endif /* SQLITE_OS_WINCE */
-
+#endif
 
 #ifdef SQLITE_DEBUG
 /*