scottmac Thu Jul 24 14:25:33 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdo_sqlite config.m4 config.w32 Log: MFH: Remove non existent defines and change THREADSAFE to SQLITE_THREADSAFE http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.9.2.7.2.2&r2=1.26.2.9.2.7.2.3&diff_format=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.2 php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.3 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.2 Thu Jul 24 00:24:03 2008 +++ php-src/ext/pdo_sqlite/config.m4 Thu Jul 24 14:25:33 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.9.2.7.2.2 2008/07/24 00:24:03 scottmac Exp $ +dnl $Id: config.m4,v 1.26.2.9.2.7.2.3 2008/07/24 14:25:33 scottmac Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -74,14 +74,14 @@ 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) http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.6.2.1.2.3.2.4&r2=1.6.2.1.2.3.2.5&diff_format=u Index: php-src/ext/pdo_sqlite/config.w32 diff -u php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.4 php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.5 --- php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.4 Thu Jul 24 11:33:32 2008 +++ php-src/ext/pdo_sqlite/config.w32 Thu Jul 24 14:25:33 2008 @@ -1,10 +1,10 @@ -// $Id: config.w32,v 1.6.2.1.2.3.2.4 2008/07/24 11:33:32 scottmac Exp $ +// $Id: config.w32,v 1.6.2.1.2.3.2.5 2008/07/24 14:25:33 scottmac Exp $ // vim:ft=javascript 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');
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php