Hi,
current head fails to compile in ZTS mode. Fix attached.
- Timm
Index: Zend/zend_execute.c
===================================================================
RCS file: /repository/ZendEngine2/zend_execute.c,v
retrieving revision 1.635
diff -u -r1.635 zend_execute.c
--- Zend/zend_execute.c 25 Mar 2004 14:03:34 -0000 1.635
+++ Zend/zend_execute.c 26 Mar 2004 00:12:20 -0000
@@ -1764,10 +1764,10 @@
if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get)
&& Z_OBJ_HANDLER_PP(var_ptr, set)) {
/* proxy object */
- zval *objval = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr);
+ zval *objval = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC);
objval->refcount++;
binary_op(objval, objval, value TSRMLS_CC);
- Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, objval);
+ Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, objval TSRMLS_CC);
zval_ptr_dtor(&objval);
} else {
binary_op(*var_ptr, *var_ptr, value TSRMLS_CC);
@@ -1908,10 +1908,10 @@
if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get)
&& Z_OBJ_HANDLER_PP(var_ptr, set)) {
/* proxy object */
- zval *val = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr);
+ zval *val = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC);
val->refcount++;
incdec_op(val);
- Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, val);
+ Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, val TSRMLS_CC);
zval_ptr_dtor(&val);
} else {
incdec_op(*var_ptr);
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
