diff options
| author | James Turner <jturner@cvs.openbsd.org> | 2015-03-16 00:06:49 +0000 |
|---|---|---|
| committer | James Turner <jturner@cvs.openbsd.org> | 2015-03-16 00:06:49 +0000 |
| commit | 608b21ff04dea9eb389a53f841c363d0ab679565 (patch) | |
| tree | b30d8977d15607c81a53118c7d9016c944e76425 | |
| parent | cb5c37711f2a4e64ac2d4f12b5e940d6fa52c2b1 (diff) | |
Update sqlite3 to 3.8.7.4. Changes available here: http://sqlite.org/changes.html#version_3_8_7_4
ok landry@
| -rw-r--r-- | lib/libsqlite3/src/threads.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/libsqlite3/src/threads.c b/lib/libsqlite3/src/threads.c index 4ce6122274c..18d7320a123 100644 --- a/lib/libsqlite3/src/threads.c +++ b/lib/libsqlite3/src/threads.c @@ -26,9 +26,6 @@ ** single-threaded if desired. */ #include "sqliteInt.h" -#if SQLITE_OS_WIN -# include "os_win.h" -#endif #if SQLITE_MAX_WORKER_THREADS>0 @@ -101,7 +98,7 @@ int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){ /********************************* Win32 Threads ****************************/ -#if SQLITE_OS_WIN_THREADS +#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> @@ -194,7 +191,7 @@ int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){ return (rc==WAIT_OBJECT_0) ? SQLITE_OK : SQLITE_ERROR; } -#endif /* SQLITE_OS_WIN_THREADS */ +#endif /* SQLITE_OS_WIN && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT */ /******************************** End Win32 Threads *************************/ |