Permalink
Browse files

- 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]
  • Loading branch information...
1 parent aedaf1a commit d29d24427f6bcc7a806be3ec6a334ce13472bd9d Derick Rethans committed May 18, 2009
Showing with 4 additions and 31 deletions.
  1. +1 −0 NEWS
  2. +1 −9 configure.in
  3. +1 −13 main/php_ini.c
  4. +1 −9 scripts/phpize.m4
View
1 NEWS
@@ -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)
View
@@ -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
View
@@ -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
*/
View
@@ -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

0 comments on commit d29d244

Please sign in to comment.