ZTS fix

diff --git a/ext/json/json.c b/ext/json/json.c
index 90e5955c09487d91a0783c7b21d499e9c717466d..dd7bb1e810bd7db35055b966f824c39638580e8b 100644 (file)
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -102,7 +102,7 @@ static PHP_MINFO_FUNCTION(json)
 /* }}} */
 
 static void json_encode_r(smart_str *buf, zval *val, int options TSRMLS_DC);
-static void json_escape_string(smart_str *buf, char *s, int len, int options);
+static void json_escape_string(smart_str *buf, char *s, int len, int options TSRMLS_DC);
 
 static int json_determine_array_type(zval **val TSRMLS_DC)  /* {{{ */
 {
@@ -208,7 +208,7 @@ static void json_encode_array(smart_str *buf, zval **val, int options TSRMLS_DC)
                             need_comma = 1;
                         }
 
-                        json_escape_string(buf, key, key_len - 1, options);
+                        json_escape_string(buf, key, key_len - 1, options TSRMLS_CC);
                         smart_str_appendc(buf, ':');
 
                         json_encode_r(buf, *data, options TSRMLS_CC);
@@ -248,7 +248,7 @@ static void json_encode_array(smart_str *buf, zval **val, int options TSRMLS_DC)
 
 #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, int options) /* {{{ */
+static void json_escape_string(smart_str *buf, char *s, int len, int options TSRMLS_DC) /* {{{ */
 {
     int pos = 0;
     unsigned short us;
@@ -433,7 +433,7 @@ static void json_encode_r(smart_str *buf, zval *val, int options TSRMLS_DC) /* {
             }
             break;
         case IS_STRING:
-            json_escape_string(buf, Z_STRVAL_P(val), Z_STRLEN_P(val), options);
+            json_escape_string(buf, Z_STRVAL_P(val), Z_STRLEN_P(val), options TSRMLS_CC);
             break;
         case IS_ARRAY:
         case IS_OBJECT: