equal
deleted
inserted
replaced
|
1 --- sqlite3.c.orig 2008-02-06 16:03:28.000000000 +0100 |
|
2 +++ sqlite3.c 2008-02-13 00:00:00.000000000 +0100 |
|
3 @@ -16823,6 +16823,8 @@ |
|
4 */ |
|
5 #if OS_UNIX /* This file is used on unix only */ |
|
6 |
|
7 +#include <qconfig.h> |
|
8 + |
|
9 /* #define SQLITE_ENABLE_LOCKING_STYLE 0 */ |
|
10 |
|
11 /* |
|
12 @@ -16865,7 +16867,7 @@ |
|
13 ** If we are to be thread-safe, include the pthreads header and define |
|
14 ** the SQLITE_UNIX_THREADS macro. |
|
15 */ |
|
16 -#if SQLITE_THREADSAFE |
|
17 +#ifndef QT_NO_THREAD |
|
18 # define SQLITE_UNIX_THREADS 1 |
|
19 #endif |
|
20 |
|
21 @@ -19739,6 +19741,8 @@ |
|
22 ** desktops but not so well in embedded systems. |
|
23 */ |
|
24 |
|
25 +#include <qconfig.h> |
|
26 + |
|
27 #include <winbase.h> |
|
28 |
|
29 #ifdef __CYGWIN__ |
|
30 @@ -19748,7 +19752,7 @@ |
|
31 /* |
|
32 ** Macros used to determine whether or not to use threads. |
|
33 */ |
|
34 -#if defined(THREADSAFE) && THREADSAFE |
|
35 +#ifndef QT_NO_THREAD |
|
36 # define SQLITE_W32_THREADS 1 |
|
37 #endif |
|
38 |