MFH: Remove non existent defines and change THREADSAFE to SQLITE_THREADSAFE

diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index 7fb3e56ebf18598affada4d5198af46fcc59657a..5c33da65d3241c3a055eb8c0d45c63811cc49983 100644 (file)
--- 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 ba8d0abc02cfc3b28b3ce2a73252ed79ee83110b..fdb19b95d6d7f14d9de9fcc758363832d896657a 100644 (file)
--- 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');