mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-18 09:43:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Fix ZTS build

Browse Source
This commit is contained in:
Felipe Pena 2010-07-06 15:52:39 +00:00
parent 1a1178a685
commit 3ea3bbaca3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zend/zend_API.c
View File

@ -1685,7 +1685,7 @@ try_again:
}
/* }}} */
static void zend_collect_module_handlers(void) /* {{{ */
static void zend_collect_module_handlers(TSRMLS_D) /* {{{ */
{
HashPosition pos;
zend_module_entry *module;
@ -1767,7 +1767,7 @@ ZEND_API int zend_startup_modules(TSRMLS_D) /* {{{ */
{
zend_hash_sort(&module_registry, zend_sort_modules, NULL, 0 TSRMLS_CC);
zend_hash_apply(&module_registry, (apply_func_t)zend_startup_module_ex TSRMLS_CC);
zend_collect_module_handlers();
zend_collect_module_handlers(TSRMLS_C);
return SUCCESS;
}
/* }}} */

2
Zend/zend_compile.h
View File

@ -616,7 +616,7 @@ ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle TSRMLS_DC);
ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC);
ZEND_API int zend_cleanup_user_class_data(zend_class_entry **pce TSRMLS_DC);
ZEND_API void zend_cleanup_internal_class_data(zend_class_entry *ce TSRMLS_DC);
ZEND_API void zend_cleanup_internal_classes(TSRMLS_C);
ZEND_API void zend_cleanup_internal_classes(TSRMLS_D);
ZEND_API int zend_cleanup_function_data(zend_function *function TSRMLS_DC);
ZEND_API int zend_cleanup_function_data_full(zend_function *function TSRMLS_DC);

2
Zend/zend_opcode.c
View File

@ -190,7 +190,7 @@ static inline void cleanup_internal_class_data(zend_class_entry *ce TSRMLS_DC)
}
efree(CE_STATIC_MEMBERS(ce));
#ifdef ZTS
CG(static_members_table)[(zend_intptr_t)((ce->static_members_table)] = NULL;
CG(static_members_table)[(zend_intptr_t)(ce->static_members_table)] = NULL;
#else
ce->static_members_table = NULL;
#endif