diff options
| author | mistachkin <mistachkin@noemail.net> | 2014-10-16 18:34:50 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2014-10-16 18:34:50 +0000 |
| commit | 92c2e0da8f6fbec24e953f8b1acf26c6d33f55e0 (patch) | |
| tree | 2cff57d79b241a6039f9e6c5d7acce347630420d /src | |
| parent | facd5fd6221a547a1fd92c0ee517d3978f34ce6d (diff) | |
| download | sqlite-92c2e0da8f6fbec24e953f8b1acf26c6d33f55e0.tar.gz sqlite-92c2e0da8f6fbec24e953f8b1acf26c6d33f55e0.zip | |
Changes to work around Win32 and MSVCRT APIs that are not present on Windows CE 200x.
FossilOrigin-Name: 1418c006e377d7915a50577d4ccb21125b750bae
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_win.c | 7 | ||||
| -rw-r--r-- | src/threads.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/os_win.c b/src/os_win.c index e12ce4e53..8ca2107d9 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -943,7 +943,11 @@ static struct win_syscall { #define osWaitForSingleObject ((DWORD(WINAPI*)(HANDLE, \ DWORD))aSyscall[63].pCurrent) +#if !SQLITE_OS_WINCE { "WaitForSingleObjectEx", (SYSCALL)WaitForSingleObjectEx, 0 }, +#else + { "WaitForSingleObjectEx", (SYSCALL)0, 0 }, +#endif #define osWaitForSingleObjectEx ((DWORD(WINAPI*)(HANDLE,DWORD, \ BOOL))aSyscall[64].pCurrent) @@ -1286,7 +1290,8 @@ void sqlite3_win32_sleep(DWORD milliseconds){ #endif } -#if SQLITE_MAX_WORKER_THREADS>0 && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0 +#if SQLITE_MAX_WORKER_THREADS>0 && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && \ + SQLITE_THREADSAFE>0 DWORD sqlite3Win32Wait(HANDLE hObject){ DWORD rc; while( (rc = osWaitForSingleObjectEx(hObject, INFINITE, diff --git a/src/threads.c b/src/threads.c index 6d39042fd..18d7320a1 100644 --- a/src/threads.c +++ b/src/threads.c @@ -98,7 +98,7 @@ int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){ /********************************* Win32 Threads ****************************/ -#if SQLITE_OS_WIN && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0 +#if SQLITE_OS_WIN && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0 #define SQLITE_THREADS_IMPLEMENTED 1 /* Prevent the single-thread code below */ #include <process.h> @@ -191,7 +191,7 @@ int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){ return (rc==WAIT_OBJECT_0) ? SQLITE_OK : SQLITE_ERROR; } -#endif /* SQLITE_OS_WIN && !SQLITE_OS_WINRT */ +#endif /* SQLITE_OS_WIN && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT */ /******************************** End Win32 Threads *************************/ |