diff options
| author | Pierre Joye <pajoye@php.net> | 2008-11-22 13:41:21 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-11-22 13:41:21 +0000 |
| commit | b2e419ef40af4c685e1374bf345a0819e7eb1d1d (patch) | |
| tree | 4f09ce97f2317b20d8de7136f0ca2642548680bd | |
| parent | bbb88024ec31cec3be38f3ae9979dbdfb0d34b2a (diff) | |
| download | php-git-b2e419ef40af4c685e1374bf345a0819e7eb1d1d.tar.gz | |
- Fix windows build
please keep the fixes while merging the new versions.
if the updates do not contain the fixes, create a little todo list so it is
not forgotten (wiki)
| -rw-r--r-- | ext/sqlite3/libsqlite/sqlite3.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index 2aaf123798..cea129ad53 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -401,16 +401,12 @@ SQLITE_PRIVATE void sqlite3Coverage(int); ** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as ** the default. */ -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ - defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ - defined(SQLITE_POW2_MEMORY_SIZE)>1 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+ defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)>1 # error "At most one of the following compile-time configuration options\ is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG, SQLITE_MEMORY_SIZE,\ SQLITE_MMAP_HEAP_SIZE, SQLITE_POW2_MEMORY_SIZE" #endif -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ - defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ - defined(SQLITE_POW2_MEMORY_SIZE)==0 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)==0 # define SQLITE_SYSTEM_MALLOC 1 #endif |