cvs: ZendEngine2 / zend_API.c zend_operators.h

zeev Wed Jan 1 07:38:56 2003 EDT Modified files: /ZendEngine2 zend_API.c zend_operators.h Log: Win32 build fix Index: ZendEngine2/zend_API.c diff -u ZendEngine2/zend_API.c:1.140 ZendEngine2/zend_API.c:1.141 --- ZendEngine2/zend_API.c:1.140 Wed Jan 1 04:34:39 2003 +++ ZendEngine2/zend_API.c Wed Jan 1 07:38:54 2003 @@ -936,6 +936,7 @@ 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_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_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_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_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_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_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_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); } Index: ZendEngine2/zend_operators.h diff -u ZendEngine2/zend_operators.h:1.64 ZendEngine2/zend_operators.h:1.65 --- ZendEngine2/zend_operators.h:1.64 Wed Jan 1 05:57:35 2003 +++ ZendEngine2/zend_operators.h Wed Jan 1 07:38:55 2003 @@ -240,7 +240,7 @@ #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)