derick Mon May 18 21:28:42 2009 UTC
Modified files:
/php-src configure.in
/php-src/scripts phpize.m4
/php-src/main php_ini.c
Log:
- Get rid of the four different versions of zend_extension* and only use
zend_extension. Because of the API identifier change in PHP 5.3 you also get
a proper warning message now.
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.677&r2=1.678&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.677 php-src/configure.in:1.678
--- php-src/configure.in:1.677 Wed May 6 14:04:58 2009
+++ php-src/configure.in Mon May 18 21:28:42 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.677 2009/05/06 14:04:58 iliaa Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.678 2009/05/18 21:28:42 derick Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1246,15 +1246,7 @@
CPPFLAGS="$CPPFLAGS -DTHREAD=1"
fi
-if test "$PHP_DEBUG" = "1" && test "$PHP_THREAD_SAFETY" = "yes"; then
- ZEND_EXT_TYPE="zend_extension_debug_ts"
-elif test "$PHP_DEBUG" = "1"; then
- ZEND_EXT_TYPE="zend_extension_debug"
-elif test "$PHP_THREAD_SAFETY" = "yes"; then
- ZEND_EXT_TYPE="zend_extension_ts"
-else
- ZEND_EXT_TYPE="zend_extension"
-fi
+ZEND_EXT_TYPE="zend_extension"
PHP_SUBST(ZEND_EXT_TYPE)
dnl
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.31&r2=1.32&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.31 php-src/scripts/phpize.m4:1.32
--- php-src/scripts/phpize.m4:1.31 Thu Dec 4 00:41:55 2008
+++ php-src/scripts/phpize.m4 Mon May 18 21:28:42 2009
@@ -96,15 +96,7 @@
AC_MSG_RESULT([$PHP_DEBUG])
dnl Support for building and testing Zend extensions
-if test "$PHP_DEBUG" = "yes" && test "$PHP_THREAD_SAFETY" = "yes; then
- ZEND_EXT_TYPE="zend_extension_debug_ts"
-elif test "$PHP_DEBUG" = "yes"; then
- ZEND_EXT_TYPE="zend_extension_debug"
-elif test "$PHP_THREAD_SAFETY" = "yes; then
- ZEND_EXT_TYPE="zend_extension_ts"
-else
- ZEND_EXT_TYPE="zend_extension"
-fi
+ZEND_EXT_TYPE="zend_extension"
PHP_SUBST(ZEND_EXT_TYPE)
dnl Discard optimization flags when debugging is enabled
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.172&r2=1.173&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.172 php-src/main/php_ini.c:1.173
--- php-src/main/php_ini.c:1.172 Tue Mar 10 23:39:53 2009
+++ php-src/main/php_ini.c Mon May 18 21:28:42 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.172 2009/03/10 23:39:53 helly Exp $ */
+/* $Id: php_ini.c,v 1.173 2009/05/18 21:28:42 derick Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -170,19 +170,7 @@
/* php.ini support */
#define PHP_EXTENSION_TOKEN "extension"
-#ifdef ZTS
-# if (ZEND_DEBUG)
-# define ZEND_EXTENSION_TOKEN "zend_extension_debug_ts"
-# else
-# define ZEND_EXTENSION_TOKEN "zend_extension_ts"
-# endif
-#else
-# if (ZEND_DEBUG)
-# define ZEND_EXTENSION_TOKEN "zend_extension_debug"
-# else
-# define ZEND_EXTENSION_TOKEN "zend_extension"
-# endif
-#endif
+#define ZEND_EXTENSION_TOKEN "zend_extension"
/* {{{ config_zval_dtor
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
