Fix the build on windows.

FossilOrigin-Name: 2773a5f9879a106a89a3d0bc3c5bfdcb2fe43c7c

diff --git a/manifest b/manifest
index 5ef711c8075538da975a1ed6a07e379f95a4c153..dd136942c20e6093a6f3dcb4b7d65a326cb680de 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunnecessary\sparameter\sfrom\svdbeMergeEngineStep().\s\sRename\sa\scouple\nother\sroutines\sto\sbe\smore\sdescriptive\sof\swhat\sthey\sdo.
-D 2014-07-28T20:16:41.054
+C Fix\sthe\sbuild\son\swindows.
+D 2014-07-29T00:23:08.770
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -208,7 +208,7 @@ F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c a7baf1b30f3c58ba20b813e01aab23b18ae44f85
-F src/os_win.c 5f8c5568cc749d6ab44006124e7701f463559223
+F src/os_win.c 047e903174b018c50f425be793eafa8d849737a9
 F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
 F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
@@ -227,7 +227,7 @@ F src/shell.c 05e9e7f667a6340643b647c4be0db15dd7627d92
 F src/sqlite.h.in a30af69fcbc8fab8b4a00032f9f1d24ba2f01c2c
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
-F src/sqliteInt.h f2b28ce01099fdeb75a222aeddeece7384c9d56a
+F src/sqliteInt.h 9c1e5b965191c54157b155e321fa473b9734e062
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -277,7 +277,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 3c63f60ce0aae4c40ed4b8dc745490ff42a05308
+F src/threads.c afdab9acbda8b96dd0e55052de59b87d972cadc1
 F src/tokenize.c ae45399d6252b4d736af43bee1576ce7bff86aec
 F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
 F src/update.c 01564b3c430f6c7b0a35afaf7aba7987206fa3a5
@@ -1189,7 +1189,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 5b084a2dd581141b2d0cd9d1a5975625f65ec34d
-R 73873dcfe41a2b7643bb45186ddcf360
+P f2407a40f339fa6c2cec194f78ae7c93655b1ec1
+R bc66c7b33352e0660fc93d07e7c8b3a0
 U drh
-Z 40695df9717fb1b9f124285f8dbce47e
+Z c1a505884ff19c661f20155161198823

diff --git a/manifest.uuid b/manifest.uuid
index ec9fe1279abc8e2260e3ff059fe840d28e4d101c..2e59c45d3ed1642ba7bebae27c9d981e008cbb13 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f2407a40f339fa6c2cec194f78ae7c93655b1ec1
\ No newline at end of file
+2773a5f9879a106a89a3d0bc3c5bfdcb2fe43c7c
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 5c246a858602e725f70d5f3569f9d97f5be77fb5..fa485978d357aa5dbf1b3300d95461da57e0afd3 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -1275,13 +1275,6 @@ void sqlite3_win32_sleep(DWORD milliseconds){
 #endif
 }
 
-DWORD sqlite3Win32Wait(HANDLE hObject){
-  DWORD rc;
-  while( (rc = osWaitForSingleObjectEx(hObject, INFINITE,
-                                       TRUE))==WAIT_IO_COMPLETION ){}
-  return rc;
-}
-
 /*
 ** Return true (non-zero) if we are running under WinNT, Win2K, WinXP,
 ** or WinCE.  Return false (zero) for Win95, Win98, or WinME.

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 4ad80e4373035c469219b27ac4254c8955334545..8761556ae2c89dcb6af8bb0f7de2f915d01db4d2 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3723,11 +3723,4 @@ int sqlite3ThreadCreate(SQLiteThread**,void*(*)(void*),void*);
 int sqlite3ThreadJoin(SQLiteThread*, void**);
 #endif
 
-/*
-** Win32 interface
-*/
-#if SQLITE_OS_WIN
-  DWORD sqlite3Win32Wait(HANDLE hObject);
-#endif
-
 #endif /* _SQLITEINT_H_ */

diff --git a/src/threads.c b/src/threads.c
index 1cfe2cc6cee29026b36b0fa212dddf831083147d..634dda3b7da260854bf72f64c65e11976c0e10f0 100644 (file)
--- a/src/threads.c
+++ b/src/threads.c
@@ -147,6 +147,14 @@ int sqlite3ThreadCreate(
   return SQLITE_OK;
 }
 
+/* Wait on an object */
+DWORD sqlite3Win32Wait(HANDLE hObject){
+  DWORD rc;
+  while( (rc = osWaitForSingleObjectEx(hObject, INFINITE,
+                                       TRUE))==WAIT_IO_COMPLETION ){}
+  return rc;
+}
+
 /* Get the results of the thread */
 int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){
   DWORD rc;