The _beginthreadex() / _endthreadex() functions should only be used when compiling...

FossilOrigin-Name: 1a5a5da3315e6fe768b8527e46c4d24c6d0e71fb

diff --git a/manifest b/manifest
index 8290b14522c03337edcb710d20a41fc6e64fde8f..c2f1090ed5525f896db6d250ec908ab6166d5d16 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Take\ssteps\sto\savoid\smisestimating\srange\squery\scosts\sbased\son\sSTAT4\sdata\ndue\sto\sthe\sroundoff\serror\sof\sconverting\sfrom\sintegers\sto\sLogEst\sand\sback\nto\sintegers.
-D 2014-10-22T15:27:05.734
+C The\s_beginthreadex()\s/\s_endthreadex()\sfunctions\sshould\sonly\sbe\sused\swhen\scompiling\swith\sMSVC.
+D 2014-10-22T16:25:09.852
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -178,7 +178,7 @@ F src/btreeInt.h 026d0129724e8f265fdc60d44ec240cf5a4e6179
 F src/build.c 9dc2bd94347b878c89627000c92b0c8d97ec2919
 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
 F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
-F src/ctime.c bb434068b5308a857b181c2d204a320ff0d6c638
+F src/ctime.c cc296efb42c55f03e439bf4b99d5eb37d4429db9
 F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
 F src/delete.c fae81cc2eb14b75267d4f47d3cfc9ae02aae726f
 F src/expr.c fc204d08af06437ddaffe5a1b1f1f6f9e1a55d6d
@@ -282,7 +282,7 @@ F src/test_thread.c 1e133a40b50e9c035b00174035b846e7eef481cb
 F src/test_vfs.c f84075a388527892ff184988f43b69ce69b8083c
 F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
-F src/threads.c 6de09362b657f19ba83e5fa521ee715787ce9fee
+F src/threads.c 2fa8433e5f766d272d25f722b2a18b1c3e123b7e
 F src/tokenize.c cc9016e5007fc5e76789079616d2f26741bcc689
 F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
 F src/update.c 729f6f18fc27740591d085e1172cebe311144bf0
@@ -1205,7 +1205,10 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 3e922208b68563489c7766abb9afb4885113e7b8
-R 5c508733aebac553de79291a7eabd709
-U drh
-Z a3d7104c7f173585d7e788d6453aa065
+P 3c933bf95f291f7957580d823dce92c981375a5c
+R af2834bb71df32c5023a7384a0a52a6c
+T *branch * msvcThreads
+T *sym-msvcThreads *
+T -sym-trunk *
+U mistachkin
+Z fb1887a94bcdc5356b2224d0baf2a2e1

diff --git a/manifest.uuid b/manifest.uuid
index b84af28cee10485acfaa2deeceb1c6d5ed405ad0..878a22ab39b78fe48f135d24a730de96865d6330 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3c933bf95f291f7957580d823dce92c981375a5c
\ No newline at end of file
+1a5a5da3315e6fe768b8527e46c4d24c6d0e71fb
\ No newline at end of file

diff --git a/src/ctime.c b/src/ctime.c
index 82a2f352044804e44384fec0ddb932cf5190d433..1ad73884e3932d93177eccae9fab1633049b4b3e 100644 (file)
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -155,6 +155,9 @@ static const char * const azCompileOpt[] = {
 #ifdef SQLITE_MAX_SCHEMA_RETRY
   "MAX_SCHEMA_RETRY=" CTIMEOPT_VAL(SQLITE_MAX_SCHEMA_RETRY),
 #endif
+#ifdef SQLITE_MAX_WORKER_THREADS
+  "MAX_WORKER_THREADS=" CTIMEOPT_VAL(SQLITE_MAX_WORKER_THREADS),
+#endif
 #ifdef SQLITE_MEMDEBUG
   "MEMDEBUG",
 #endif

diff --git a/src/threads.c b/src/threads.c
index 18d7320a123e5b74b17d0818c8310764df15d410..909145174eba52237ed39036f209d637d7395e7b 100644 (file)
--- a/src/threads.c
+++ b/src/threads.c
@@ -98,7 +98,8 @@ int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){
 
 
 /********************************* Win32 Threads ****************************/
-#if SQLITE_OS_WIN && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0
+#if SQLITE_OS_WIN && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && \
+    SQLITE_THREADSAFE>0 && defined(_MSC_VER)
 
 #define SQLITE_THREADS_IMPLEMENTED 1  /* Prevent the single-thread code below */
 #include <process.h>
@@ -191,7 +192,8 @@ int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){
   return (rc==WAIT_OBJECT_0) ? SQLITE_OK : SQLITE_ERROR;
 }
 
-#endif /* SQLITE_OS_WIN && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT */
+#endif /* SQLITE_OS_WIN && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && \
+          SQLITE_THREADSAFE>0 && defined(_MSC_VER) */
 /******************************** End Win32 Threads *************************/