From: mistachkin Date: Mon, 4 Jun 2012 05:18:32 +0000 (+0000) Subject: When not compiling for WinRT, skip using a couple Win32 APIs unavailable when compili... X-Git-Tag: version-3.7.13~11^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=401e9153e9c8a28380146495159eac4da9275c66;p=thirdparty%2Fsqlite.git When not compiling for WinRT, skip using a couple Win32 APIs unavailable when compiling with MinGW. FossilOrigin-Name: eb29e2d93984c29756430b55c08501d7e1783df0 --- diff --git a/manifest b/manifest index ef63fa7d06..9d43e5d76f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sseveral\sAPIs\sto\senable\scompilation\swith\snewer\srevisions\sof\sWinRT. -D 2012-05-31T22:12:26.763 +C When\snot\scompiling\sfor\sWinRT,\sskip\susing\sa\scouple\sWin32\sAPIs\sunavailable\swhen\scompiling\swith\sMinGW. +D 2012-06-04T05:18:32.951 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -160,7 +160,7 @@ F src/os.h 38aabd5e3ecd4162332076f55bb09cec02165cca F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440 F src/os_unix.c 424d46e0edab969293c2223f09923b2178171f47 -F src/os_win.c ce6b415a2efd30027d4881bc8266c90ed4bc3ad0 +F src/os_win.c e3d3d3e26b65a35d4293d753137a58510bd3299b F src/pager.c bb5635dde0b152797836d1c72275284724bb563c F src/pager.h ef1eaf8593e78f73885c1dfac27ad83bee23bdc5 F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099 @@ -998,7 +998,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 -P 1dd01e408161f5c1ab6b4fd449bee147d7e00744 -R e2e31613ef8f782c24f244b69c156ce3 +P 54de739f056749b53b198f6b074d9e649520cf00 +R 3d3156f22dcbc533103d303a20808da1 U mistachkin -Z 408bf47646a7d2177c7080bd3b9695d2 +Z 5ca4b04744121d2d2667ad0e95a12f12 diff --git a/manifest.uuid b/manifest.uuid index a21151147e..674e2d893b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -54de739f056749b53b198f6b074d9e649520cf00 \ No newline at end of file +eb29e2d93984c29756430b55c08501d7e1783df0 \ No newline at end of file diff --git a/src/os_win.c b/src/os_win.c index 376e240c75..8509e9272d 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -684,7 +684,7 @@ static struct win_syscall { #define osWriteFile ((BOOL(WINAPI*)(HANDLE,LPCVOID,DWORD,LPDWORD, \ LPOVERLAPPED))aSyscall[58].pCurrent) -#if !SQLITE_OS_WINCE +#if SQLITE_OS_WINRT { "CreateEventExW", (SYSCALL)CreateEventExW, 0 }, #else { "CreateEventExW", (SYSCALL)0, 0 }, @@ -720,7 +720,7 @@ static struct win_syscall { #define osSetFilePointerEx ((BOOL(WINAPI*)(HANDLE,LARGE_INTEGER, \ PLARGE_INTEGER,DWORD))aSyscall[62].pCurrent) -#if !SQLITE_OS_WINCE +#if SQLITE_OS_WINRT { "GetFileInformationByHandleEx", (SYSCALL)GetFileInformationByHandleEx, 0 }, #else { "GetFileInformationByHandleEx", (SYSCALL)0, 0 },