From: Edin Kadribasic <edink@php.net>
Date: Sun, 11 Dec 2005 13:19:43 +0000 (+0000)
Subject: Fixed ZTS build
X-Git-Tag: RELEASE_1_0_4~417
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a57d03c8dbc83feee7b2402cb33e7bad0872baf;p=php

Fixed ZTS build
---

diff --git a/ext/json/json.c b/ext/json/json.c
index e7fa452471..43902a8cb5 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -79,7 +79,7 @@ PHP_MINFO_FUNCTION(json)
 }
 /* }}} */
 
-static struct json_object *json_encode_r(zval *val);
+static struct json_object *json_encode_r(zval *val TSRMLS_DC);
 
 static int json_determine_array_type(zval **val TSRMLS_DC) {
     int i;
@@ -156,7 +156,7 @@ static struct json_object *json_encode_array(zval **val TSRMLS_DC) {
                 break;
 
             if (zend_hash_get_current_data_ex(myht, (void **) &data, &pos) == SUCCESS) {
-                member = json_encode_r(*data);
+                member = json_encode_r(*data TSRMLS_CC);
                 if (r == 0) {
                     json_object_array_add(obj, member);
                 } else if (r == 1) {
@@ -182,7 +182,7 @@ static struct json_object *json_encode_array(zval **val TSRMLS_DC) {
     return obj;
 }
 
-static struct json_object *json_encode_r(zval *val) {
+static struct json_object *json_encode_r(zval *val TSRMLS_DC) {
     struct json_object *jo;
 
     switch (Z_TYPE_P(val)) {
@@ -226,7 +226,7 @@ PHP_FUNCTION(json_encode)
         return;
     }
 
-    jo = json_encode_r(parameter);
+    jo = json_encode_r(parameter TSRMLS_CC);
 
     s = estrdup(json_object_to_json_string(jo));