mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 09:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

- MFH: Get rid of the four different versions of zend_extension* and only use

Browse Source 
zend_extension. Because of the API identifier change in PHP 5.3 you also get
  a proper warning message now.
#- [DOC]
This commit is contained in:
Derick Rethans 2009-05-18 21:33:38 +00:00
parent aedaf1aea9
commit d29d24427f
4 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -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)

10
configure.in
View File

@ -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

14
main/php_ini.c
View File

@ -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
*/

10
scripts/phpize.m4
View File

@ -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