From 9721c21c41c9443c804a9d3f2489703f9ae10234 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Mon, 18 Jun 2012 17:15:29 +0000 Subject: [PATCH] Allow the SQLITE_API macro to apply to the sqlite3_win32_sleep function. FossilOrigin-Name: 21266c68afb067ff40062df1e8b383dfd247c17b --- manifest | 15 ++++++--------- manifest.uuid | 2 +- src/mutex_w32.c | 3 ++- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index d36e959c74..5f05b6d64e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sfew\scompilation\sissues\sthat\scan\soccur\swith\scertain\scompilers\s(e.g.\sGCC\s2.95.3,\sMSVC). -D 2012-06-18T08:00:56.560 +C Allow\sthe\sSQLITE_API\smacro\sto\sapply\sto\sthe\ssqlite3_win32_sleep\sfunction. +D 2012-06-18T17:15:29.347 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in d17fddaa4e81f93a7c9c7c0808aacb3fc95f79f4 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -158,7 +158,7 @@ F src/mutex.h 2a79e0c10c26412546b501ee0f3d92b42decf63e F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553 F src/mutex_os2.c 882d735098c07c8c6a5472b8dd66e19675fe117f F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc -F src/mutex_w32.c aedeaae3a850f6237ad142206911e3053a393e02 +F src/mutex_w32.c 32a9b3841e2d757355f0012b860b1bc5e01eafa0 F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30 F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c F src/os.h 38aabd5e3ecd4162332076f55bb09cec02165cca @@ -1005,10 +1005,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 -P 0c2fb18d25217ada7e75dcab8b342bbc632875d8 -R 1fec034065f8f455e31652ddfa62f1cf -T *branch * compiler-compat -T *sym-compiler-compat * -T -sym-trunk * +P f970a3de61fe2ebaf1778c4a3383cfdc52299162 +R f7c2f2158f3710573c689aa0bb5b67ff U mistachkin -Z 855dea24159ac5797cf9bffe7655aa6d +Z 6375ed0474e573645b8013045823eb03 diff --git a/manifest.uuid b/manifest.uuid index 9a664fabef..94bee6bf1f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f970a3de61fe2ebaf1778c4a3383cfdc52299162 \ No newline at end of file +21266c68afb067ff40062df1e8b383dfd247c17b \ No newline at end of file diff --git a/src/mutex_w32.c b/src/mutex_w32.c index 56b4a4d925..27d10af5bd 100644 --- a/src/mutex_w32.c +++ b/src/mutex_w32.c @@ -109,6 +109,8 @@ static int winMutex_isInit = 0; */ static long winMutex_lock = 0; +void sqlite3_win32_sleep(DWORD milliseconds); /* os_win.c */ + static int winMutexInit(void){ /* The first to increment to 1 does actual initialization */ if( InterlockedCompareExchange(&winMutex_lock, 1, 0)==0 ){ @@ -124,7 +126,6 @@ static int winMutexInit(void){ }else{ /* Someone else is in the process of initing the static mutexes */ while( !winMutex_isInit ){ - extern void sqlite3_win32_sleep(DWORD milliseconds); /* os_win.c */ sqlite3_win32_sleep(1); } } -- 2.39.5