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

sebastian Fri Aug 22 08:17:02 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/json json.c Log: Fix ZTS build. http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.22&r2=1.9.2.23&diff_format=u Index: php-src/ext/json/json.c diff -u php-src/ext/json/json.c:1.9.2.22 php-src/ext/json/json.c:1.9.2.23 --- php-src/ext/json/json.c:1.9.2.22 Thu Aug 21 18:10:48 2008 +++ php-src/ext/json/json.c Fri Aug 22 08:17:02 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: json.c,v 1.9.2.22 2008/08/21 18:10:48 stas Exp $ */ +/* $Id: json.c,v 1.9.2.23 2008/08/22 08:17:02 sebastian Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -84,7 +84,7 @@ /* }}} */ static void json_encode_r(smart_str *buf, zval *val TSRMLS_DC); -static void json_escape_string(smart_str *buf, char *s, int len); +static void json_escape_string(smart_str *buf, char *s, int len TSRMLS_DC); static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */ { @@ -190,7 +190,7 @@ need_comma = 1; } - json_escape_string(buf, key, key_len - 1); + json_escape_string(buf, key, key_len - 1 TSRMLS_CC); smart_str_appendc(buf, ':'); json_encode_r(buf, *data TSRMLS_CC); @@ -230,7 +230,7 @@ #define REVERSE16(us) (((us & 0xf) << 12) | (((us >> 4) & 0xf) << 8) | (((us >> 8) & 0xf) << 4) | ((us >> 12) & 0xf)) -static void json_escape_string(smart_str *buf, char *s, int len) /* {{{ */ +static void json_escape_string(smart_str *buf, char *s, int len TSRMLS_DC) /* {{{ */ { int pos = 0; unsigned short us; @@ -375,7 +375,7 @@ } break; case IS_STRING: - json_escape_string(buf, Z_STRVAL_P(val), Z_STRLEN_P(val)); + json_escape_string(buf, Z_STRVAL_P(val), Z_STRLEN_P(val) TSRMLS_CC); break; case IS_ARRAY: case IS_OBJECT: