Permalink
Browse files

- Fix ZTS build

  • Loading branch information...
1 parent 1a1178a commit 3ea3bbaca318c0a77d0c73166d79073d37d76f13 @felipensp felipensp committed Jul 6, 2010
Showing with 4 additions and 4 deletions.
  1. +2 −2 Zend/zend_API.c
  2. +1 −1 Zend/zend_compile.h
  3. +1 −1 Zend/zend_opcode.c
View
@@ -1685,7 +1685,7 @@ static void zend_sort_modules(void *base, size_t count, size_t siz, compare_func
}
/* }}} */
-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;
}
/* }}} */
View
@@ -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);
View
@@ -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

0 comments on commit 3ea3bba

Please sign in to comment.