summaryrefslogtreecommitdiff
path: root/main/php_ini.c
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2009-05-18 21:33:38 +0000
committerDerick Rethans <derick@php.net>2009-05-18 21:33:38 +0000
commitd29d24427f6bcc7a806be3ec6a334ce13472bd9d (patch)
treeda839dda79caf0656d991b366acd389e2610a8b7 /main/php_ini.c
parentaedaf1aea9807c2c84bf5d96c26dd356dbbdcfe1 (diff)
downloadphp-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]
Diffstat (limited to 'main/php_ini.c')
-rw-r--r--main/php_ini.c14
1 files changed, 1 insertions, 13 deletions
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
*/