From: mistachkin Date: Mon, 13 Aug 2012 22:05:22 +0000 (+0000) Subject: Refer to the WaitForSingleObjectEx and SetFilePointerEx Win32 functions only for... X-Git-Tag: version-3.7.14~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0aa13b67764090b15e8555dd050df76e98715cf;p=thirdparty%2Fsqlite.git Refer to the WaitForSingleObjectEx and SetFilePointerEx Win32 functions only for platforms where they are going to be used. FossilOrigin-Name: 9888ce9294c09749f5c958f965f949561867fea0 --- diff --git a/manifest b/manifest index 1c10c1b24f..029a64c6c1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C When\spopulating\san\sindex\sb-tree\sas\spart\sof\sa\sCREATE\sINDEX\sor\sREINDEX\sstatement,\sdistribute\scells\sbetween\sup\sto\sthree\ssiblings\sin\sbalance_nonroot()\sinstead\sof\sfour.\sThis\sproduces\sidentical\sdatabase\sfiles,\sbut\sis\sslightly\sfaster. -D 2012-08-08T14:04:56.819 +C Refer\sto\sthe\sWaitForSingleObjectEx\sand\sSetFilePointerEx\sWin32\sfunctions\sonly\sfor\splatforms\swhere\sthey\sare\sgoing\sto\sbe\sused. +D 2012-08-13T22:05:22.296 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -163,7 +163,7 @@ F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_unix.c d7c96b5d140f550f07345870112fae5d7ef99757 -F src/os_win.c e3d3d3e26b65a35d4293d753137a58510bd3299b +F src/os_win.c 5de2e293ce912be89edcd8b1f97d25a05201d705 F src/pager.c e381c118b77dc22021a1a59d3fec24815e91df78 F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5 F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099 @@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9 -P efea62b96c6a242c8ac2bdad70e50c87aee5e871 -R 086d244755cccfb12a359b31e2d04664 -U dan -Z 4b1b34d0b355564b0b946417aa1a7b3d +P b0d31e779ecf01c5a235443c05f488b177ac3045 +R e108fe40c60912ec60f26ef742628f98 +U mistachkin +Z a85518ddd930e1856fb03005c1a29498 diff --git a/manifest.uuid b/manifest.uuid index 8e784bd38e..daa011d39a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b0d31e779ecf01c5a235443c05f488b177ac3045 \ No newline at end of file +9888ce9294c09749f5c958f965f949561867fea0 \ No newline at end of file diff --git a/src/os_win.c b/src/os_win.c index 8509e9272d..a533453197 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -702,7 +702,7 @@ static struct win_syscall { #define osWaitForSingleObject ((DWORD(WINAPI*)(HANDLE, \ DWORD))aSyscall[60].pCurrent) -#if !SQLITE_OS_WINCE +#if SQLITE_OS_WINRT { "WaitForSingleObjectEx", (SYSCALL)WaitForSingleObjectEx, 0 }, #else { "WaitForSingleObjectEx", (SYSCALL)0, 0 }, @@ -711,7 +711,7 @@ static struct win_syscall { #define osWaitForSingleObjectEx ((DWORD(WINAPI*)(HANDLE,DWORD, \ BOOL))aSyscall[61].pCurrent) -#if !SQLITE_OS_WINCE +#if SQLITE_OS_WINRT { "SetFilePointerEx", (SYSCALL)SetFilePointerEx, 0 }, #else { "SetFilePointerEx", (SYSCALL)0, 0 },