felipe Tue, 06 Jul 2010 15:52:39 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301026
Log:
- Fix ZTS build
Changed paths:
U php/php-src/trunk/Zend/zend_API.c
U php/php-src/trunk/Zend/zend_compile.h
U php/php-src/trunk/Zend/zend_opcode.c
Modified: php/php-src/trunk/Zend/zend_API.c
===================================================================
--- php/php-src/trunk/Zend/zend_API.c 2010-07-06 13:37:55 UTC (rev 301025)
+++ php/php-src/trunk/Zend/zend_API.c 2010-07-06 15:52:39 UTC (rev 301026)
@@ -1685,7 +1685,7 @@
}
/* }}} */
-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_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;
}
/* }}} */
Modified: php/php-src/trunk/Zend/zend_compile.h
===================================================================
--- php/php-src/trunk/Zend/zend_compile.h 2010-07-06 13:37:55 UTC (rev
301025)
+++ php/php-src/trunk/Zend/zend_compile.h 2010-07-06 15:52:39 UTC (rev
301026)
@@ -616,7 +616,7 @@
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);
Modified: php/php-src/trunk/Zend/zend_opcode.c
===================================================================
--- php/php-src/trunk/Zend/zend_opcode.c 2010-07-06 13:37:55 UTC (rev
301025)
+++ php/php-src/trunk/Zend/zend_opcode.c 2010-07-06 15:52:39 UTC (rev
301026)
@@ -190,7 +190,7 @@
}
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
