From d29d24427f6bcc7a806be3ec6a334ce13472bd9d Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Mon, 18 May 2009 21:33:38 +0000 Subject: - 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] --- main/php_ini.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'main/php_ini.c') 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 */ -- cgit v1.2.1