diff options
| author | Scott MacVicar <scottmac@php.net> | 2008-07-24 14:25:33 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2008-07-24 14:25:33 +0000 |
| commit | ccc996f1d9a3dd97828882e49b60153d36fa3e63 (patch) | |
| tree | 55d0d45abc885430ad57a558828d4cb0dba388ec | |
| parent | 91ca9b7d53cc1cd9c8cc7506b8b04fa0127c58c3 (diff) | |
| download | php-git-ccc996f1d9a3dd97828882e49b60153d36fa3e63.tar.gz | |
MFH: Remove non existent defines and change THREADSAFE to SQLITE_THREADSAFE
| -rw-r--r-- | ext/pdo_sqlite/config.m4 | 6 | ||||
| -rw-r--r-- | ext/pdo_sqlite/config.w32 | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4 index 7fb3e56ebf..5c33da65d3 100644 --- a/ext/pdo_sqlite/config.m4 +++ b/ext/pdo_sqlite/config.m4 @@ -74,14 +74,14 @@ if test "$PHP_PDO_SQLITE" != "no"; then pdo_sqlite_sources="libsqlite/sqlite3.c" if test "$enable_maintainer_zts" = "yes"; then - threadsafe_flag="-DTHREADSAFE=1" + threadsafe_flag="-DSQLITE_THREADSAFE=1" else - threadsafe_flag="-DTHREADSAFE=0" + threadsafe_flag="-DSQLITE_THREADSAFE=0" fi PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core $pdo_sqlite_sources, - $ext_shared,,-I$ext_srcdir/libsqlite -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR $threadsafe_flag -I$pdo_inc_path) + $ext_shared,,-I$ext_srcdir/libsqlite -DPDO_SQLITE_BUNDLED=1 $threadsafe_flag -I$pdo_inc_path) PHP_SUBST(PDO_SQLITE_SHARED_LIBADD) PHP_ADD_BUILD_DIR($ext_builddir/libsqlite, 1) diff --git a/ext/pdo_sqlite/config.w32 b/ext/pdo_sqlite/config.w32 index ba8d0abc02..fdb19b95d6 100644 --- a/ext/pdo_sqlite/config.w32 +++ b/ext/pdo_sqlite/config.w32 @@ -4,7 +4,7 @@ ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no"); if (PHP_PDO_SQLITE != "no") { - EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c", null, "/DSQLITE_OMIT_CURSOR /DSQLITE_THREADSAFE=1 /I" + configure_module_dirname + "/libsqlite /I" + configure_module_dirname); + EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + configure_module_dirname + "/libsqlite /I" + configure_module_dirname); ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", "pdo_sqlite"); ADD_EXTENSION_DEP('pdo_sqlite', 'pdo'); |