dmitry Wed Oct 18 07:41:33 2006 UTC
Modified files:
/php-src/ext/json JSON_parser.c
Log:
ZTS fix
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.6 php-src/ext/json/JSON_parser.c:1.7
--- php-src/ext/json/JSON_parser.c:1.6 Tue Oct 17 17:56:54 2006
+++ php-src/ext/json/JSON_parser.c Wed Oct 18 07:41:33 2006
@@ -278,7 +278,7 @@
}
-static void json_create_zval(zval **z, smart_str *buf, int type)
+static void json_create_zval(zval **z, smart_str *buf, int type TSRMLS_DC)
{
ALLOC_INIT_ZVAL(*z);
@@ -477,7 +477,7 @@
zval *mval;
smart_str_0(&buf);
- json_create_zval(&mval, &buf, type);
+ json_create_zval(&mval, &buf, type TSRMLS_CC);
if (!assoc)
{
@@ -549,7 +549,7 @@
zval *mval;
smart_str_0(&buf);
- json_create_zval(&mval, &buf, type);
+ json_create_zval(&mval, &buf, type TSRMLS_CC);
add_next_index_zval(JSON(the_zstack)[JSON(the_top)], mval);
buf.len = 0;
JSON_RESET_TYPE();
@@ -594,7 +594,7 @@
JSON(the_stack[JSON(the_top)]) == MODE_ARRAY))
{
smart_str_0(&buf);
- json_create_zval(&mval, &buf, type);
+ json_create_zval(&mval, &buf, type TSRMLS_CC);
}
switch (JSON(the_stack)[JSON(the_top)]) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php