Win32 build fix

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 4765b02f1532dc8b4094861f39d6875021ef6560..13207c177db5325cba08773ffefc9e592850ccaa 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -936,6 +936,7 @@ ZEND_API int add_get_index_stringl(zval *arg, uint index, char *str, uint length
 ZEND_API int add_property_long_ex(zval *arg, char *key, uint key_len, long n)
 {
        zval *tmp;
+       TSRMLS_FETCH();
 
        MAKE_STD_ZVAL(tmp);
        ZVAL_LONG(tmp, n);
@@ -946,6 +947,7 @@ ZEND_API int add_property_long_ex(zval *arg, char *key, uint key_len, long n)
 ZEND_API int add_property_bool_ex(zval *arg, char *key, uint key_len, int b)
 {
        zval *tmp;
+       TSRMLS_FETCH();
 
        MAKE_STD_ZVAL(tmp);
        ZVAL_BOOL(tmp, b);
@@ -956,6 +958,7 @@ ZEND_API int add_property_bool_ex(zval *arg, char *key, uint key_len, int b)
 ZEND_API int add_property_null_ex(zval *arg, char *key, uint key_len)
 {
        zval *tmp;
+       TSRMLS_FETCH();
        
        MAKE_STD_ZVAL(tmp);
        ZVAL_NULL(tmp);
@@ -966,6 +969,7 @@ ZEND_API int add_property_null_ex(zval *arg, char *key, uint key_len)
 ZEND_API int add_property_resource_ex(zval *arg, char *key, uint key_len, long n)
 {
        zval *tmp;
+       TSRMLS_FETCH();
        
        MAKE_STD_ZVAL(tmp);
        ZVAL_RESOURCE(tmp, n);
@@ -977,7 +981,8 @@ ZEND_API int add_property_resource_ex(zval *arg, char *key, uint key_len, long n
 ZEND_API int add_property_double_ex(zval *arg, char *key, uint key_len, double d)
 {
        zval *tmp;
-       
+       TSRMLS_FETCH();
+
        MAKE_STD_ZVAL(tmp);
        ZVAL_DOUBLE(tmp, d);
 
@@ -988,6 +993,7 @@ ZEND_API int add_property_double_ex(zval *arg, char *key, uint key_len, double d
 ZEND_API int add_property_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate)
 {
        zval *tmp;
+       TSRMLS_FETCH();
 
        MAKE_STD_ZVAL(tmp);
        ZVAL_STRING(tmp, str, duplicate);
@@ -998,6 +1004,7 @@ ZEND_API int add_property_string_ex(zval *arg, char *key, uint key_len, char *st
 ZEND_API int add_property_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate)
 {
        zval *tmp;
+       TSRMLS_FETCH();
 
        MAKE_STD_ZVAL(tmp);
        ZVAL_STRINGL(tmp, str, length, duplicate);
@@ -1007,6 +1014,8 @@ ZEND_API int add_property_stringl_ex(zval *arg, char *key, uint key_len, char *s
 
 ZEND_API int add_property_zval_ex(zval *arg, char *key, uint key_len, zval *value)
 {
+       TSRMLS_FETCH();
+
        return zend_hash_update(Z_OBJPROP_P(arg), key, key_len, (void *) &value, sizeof(zval *), NULL);
 }
 

diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 20ac81364f6fd3da73d957b74da580832770ae36..5e57ab60ed2049c43beebcf30d0fb285b15d13a7 100644 (file)
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -240,7 +240,7 @@ ZEND_API void zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_DC);
 #define Z_OBJ_HT(zval)      (zval).value.obj.handlers
 #define Z_OBJ(zval)                    zend_objects_get_address(&(zval))
 #define Z_OBJCE(zval)          zend_get_class_entry(&(zval))
-#define Z_OBJPROP(zval)                Z_OBJ_HT((zval))->get_properties(&(zval))
+#define Z_OBJPROP(zval)                Z_OBJ_HT((zval))->get_properties(&(zval) TSRMLS_CC)
 #define Z_RESVAL(zval)         (zval).value.lval
 
 #define Z_LVAL_P(zval_p)               Z_LVAL(*zval_p)