cvs: php-src(PHP_5_2) /ext/json json.c php_json.h

tony2001 Mon Jun 1 14:03:24 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/json json.c php_json.h Log: fix ZTS build http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.28&r2=1.9.2.29&diff_format=u Index: php-src/ext/json/json.c diff -u php-src/ext/json/json.c:1.9.2.28 php-src/ext/json/json.c:1.9.2.29 --- php-src/ext/json/json.c:1.9.2.28 Sun May 31 13:51:23 2009 +++ php-src/ext/json/json.c Mon Jun 1 14:03:24 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: json.c,v 1.9.2.28 2009/05/31 13:51:23 jani Exp $ */ +/* $Id: json.c,v 1.9.2.29 2009/06/01 14:03:24 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -393,7 +393,7 @@ } /* }}} */ -PHPAPI void php_json_decode(zval *return_value, char *buf, int buf_len, zend_bool assoc) /* {{{ */ +PHPAPI void php_json_decode(zval *return_value, char *buf, int buf_len, zend_bool assoc TSRMLS_DC) /* {{{ */ { unsigned short *utf16; int utf16_len; @@ -487,7 +487,7 @@ RETURN_NULL(); } - php_json_decode(return_value, parameter, parameter_len, assoc); + php_json_decode(return_value, parameter, parameter_len, assoc TSRMLS_CC); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/json/php_json.h?r1=1.8.2.6&r2=1.8.2.7&diff_format=u Index: php-src/ext/json/php_json.h diff -u php-src/ext/json/php_json.h:1.8.2.6 php-src/ext/json/php_json.h:1.8.2.7 --- php-src/ext/json/php_json.h:1.8.2.6 Sun May 31 18:55:36 2009 +++ php-src/ext/json/php_json.h Mon Jun 1 14:03:24 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_json.h,v 1.8.2.6 2009/05/31 18:55:36 andrei Exp $ */ +/* $Id: php_json.h,v 1.8.2.7 2009/06/01 14:03:24 tony2001 Exp $ */ #ifndef PHP_JSON_H #define PHP_JSON_H @@ -45,7 +45,7 @@ #endif PHPAPI void php_json_encode(smart_str *buf, zval *val TSRMLS_DC); -PHPAPI void php_json_decode(zval *return_value, char *buf, int buf_len, zend_bool assoc); +PHPAPI void php_json_decode(zval *return_value, char *buf, int buf_len, zend_bool assoc TSRMLS_DC); #endif /* PHP_JSON_H */