|
1 | | ---- sqlite3.c 2008-11-22 15:31:05.000000000 +0000 |
2 | | -+++ sqlite3.c 2008-11-22 15:32:21.000000000 +0000 |
| 1 | +--- sqlite3.c.orig 2011-04-17 10:54:01.000000000 -0700 |
| 2 | ++++ sqlite3.c 2011-05-12 22:57:02.000000000 -0700 |
3 | 3 | @@ -1,3 +1,7 @@ |
4 | 4 | +#if defined(_MSC_VER) && _MSC_VER < 1300 |
5 | 5 | +#pragma optimize("", off) |
6 | 6 | +#endif |
7 | 7 | + |
8 | 8 | /****************************************************************************** |
9 | 9 | ** This file is an amalgamation of many separate C source files from SQLite |
10 | | - ** version 3.6.6. By combining all the individual C code files into this |
11 | | -@@ -397,16 +401,12 @@ |
12 | | - ** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as |
13 | | - ** the default. |
14 | | - */ |
15 | | --#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ |
16 | | -- defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ |
17 | | -- defined(SQLITE_POW2_MEMORY_SIZE)>1 |
18 | | -+#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)>1 |
19 | | - # error "At most one of the following compile-time configuration options\ |
20 | | - is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG, SQLITE_MEMORY_SIZE,\ |
21 | | - SQLITE_MMAP_HEAP_SIZE, SQLITE_POW2_MEMORY_SIZE" |
22 | | - #endif |
23 | | --#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ |
24 | | -- defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ |
25 | | -- defined(SQLITE_POW2_MEMORY_SIZE)==0 |
26 | | -+#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)==0 |
27 | | - # define SQLITE_SYSTEM_MALLOC 1 |
28 | | - #endif |
29 | | - |
30 | | -@@ -98713,3 +98713,7 @@ |
| 10 | + ** version 3.7.6.2. By combining all the individual C code files into this |
| 11 | +@@ -125956,3 +125960,7 @@ |
31 | 12 | #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */ |
32 | 13 |
|
33 | 14 | /************** End of fts3_icu.c ********************************************/ |
|
0 commit comments