From 735b3423a95bbc85af9c9154510d788cb5381c5d Mon Sep 17 00:00:00 2001 From: Scott MacVicar Date: Fri, 13 May 2011 06:11:06 +0000 Subject: Update bundled SQLite to 3.7.6.2 --- ext/sqlite3/libsqlite/php-sqlite3-changes.patch | 27 ++++--------------------- 1 file changed, 4 insertions(+), 23 deletions(-) (limited to 'ext/sqlite3/libsqlite/php-sqlite3-changes.patch') diff --git a/ext/sqlite3/libsqlite/php-sqlite3-changes.patch b/ext/sqlite3/libsqlite/php-sqlite3-changes.patch index 50b2e4c51b..c97de1b7fa 100644 --- a/ext/sqlite3/libsqlite/php-sqlite3-changes.patch +++ b/ext/sqlite3/libsqlite/php-sqlite3-changes.patch @@ -1,5 +1,5 @@ ---- sqlite3.c 2008-11-22 15:31:05.000000000 +0000 -+++ sqlite3.c 2008-11-22 15:32:21.000000000 +0000 +--- sqlite3.c.orig 2011-04-17 10:54:01.000000000 -0700 ++++ sqlite3.c 2011-05-12 22:57:02.000000000 -0700 @@ -1,3 +1,7 @@ +#if defined(_MSC_VER) && _MSC_VER < 1300 +#pragma optimize("", off) @@ -7,27 +7,8 @@ + /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite - ** version 3.6.6. By combining all the individual C code files into this -@@ -397,16 +401,12 @@ - ** 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 - -@@ -98713,3 +98713,7 @@ + ** version 3.7.6.2. By combining all the individual C code files into this +@@ -125956,3 +125960,7 @@ #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */ /************** End of fts3_icu.c ********************************************/ -- cgit v1.2.1