diff options
| author | Derick Rethans <derick@php.net> | 2009-05-18 21:33:38 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2009-05-18 21:33:38 +0000 |
| commit | d29d24427f6bcc7a806be3ec6a334ce13472bd9d (patch) | |
| tree | da839dda79caf0656d991b366acd389e2610a8b7 | |
| parent | aedaf1aea9807c2c84bf5d96c26dd356dbbdcfe1 (diff) | |
| download | php-git-d29d24427f6bcc7a806be3ec6a334ce13472bd9d.tar.gz | |
- MFH: 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.
#- [DOC]
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | main/php_ini.c | 14 | ||||
| -rw-r--r-- | scripts/phpize.m4 | 10 |
4 files changed, 4 insertions, 31 deletions
@@ -5,6 +5,7 @@ PHP NEWS - Upgraded bundled libmagic to 5.03 in the fileinfo extension. (Scott) - Added the ability for json_decode() to take a user specified depth. (Scott) +- Coalesce all the zend_extension_* variables into zend_extension. (Derick) - Disabled SQLite3::loadExtension for threaded SAPIs. (Scott) diff --git a/configure.in b/configure.in index 018b228bc2..0046ea8517 100644 --- a/configure.in +++ b/configure.in @@ -1332,15 +1332,7 @@ if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then 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 diff --git a/main/php_ini.c b/main/php_ini.c index bfd985bd72..af96196ae8 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -170,19 +170,7 @@ PHPAPI void display_ini_entries(zend_module_entry *module) /* 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 */ diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 index bf40948eed..dcc9f6a2d2 100644 --- a/scripts/phpize.m4 +++ b/scripts/phpize.m4 @@ -96,15 +96,7 @@ CPPFLAGS=$old_CPPFLAGS 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 |