diff options
| author | drh <drh@noemail.net> | 2015-02-06 15:40:32 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-02-06 15:40:32 +0000 |
| commit | 1ee4a2dd88663517c8dd980926af9e76f37c88fb (patch) | |
| tree | e0bac01b14814f6505c4fc563bb27376da328908 /src/threads.c | |
| parent | 9c2e9f7afa07a7763517f0332d3a81e3f9d01d73 (diff) | |
| parent | 0e55db1cd8748942e3284eb94e774d825ff223fb (diff) | |
| download | sqlite-1ee4a2dd88663517c8dd980926af9e76f37c88fb.tar.gz sqlite-1ee4a2dd88663517c8dd980926af9e76f37c88fb.zip | |
Merge all the latest enhancements from trunk.
FossilOrigin-Name: ae7eef117f28a5dae7a05805f2d31ac532a9fcc5
Diffstat (limited to 'src/threads.c')
| -rw-r--r-- | src/threads.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/threads.c b/src/threads.c index 16f52498c..4ce612227 100644 --- a/src/threads.c +++ b/src/threads.c @@ -101,7 +101,7 @@ int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){ /********************************* Win32 Threads ****************************/ -#if SQLITE_OS_WIN && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0 +#if SQLITE_OS_WIN_THREADS #define SQLITE_THREADS_IMPLEMENTED 1 /* Prevent the single-thread code below */ #include <process.h> @@ -194,7 +194,7 @@ int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){ return (rc==WAIT_OBJECT_0) ? SQLITE_OK : SQLITE_ERROR; } -#endif /* SQLITE_OS_WIN && !SQLITE_OS_WINCE && !SQLITE_OS_WINRT */ +#endif /* SQLITE_OS_WIN_THREADS */ /******************************** End Win32 Threads *************************/ |