From: Antony Dovgal <tony2001@php.net>
Date: Mon, 1 Jun 2009 14:03:24 +0000 (+0000)
Subject: fix ZTS build
X-Git-Tag: php-5.2.10RC2~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00a461a9895fea33699fadc683ba095dd13d7600;p=php

fix ZTS build
---

diff --git a/ext/json/json.c b/ext/json/json.c
index f9efc34217..c261167df3 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -393,7 +393,7 @@ 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) /* {{{ */
 {
 	unsigned short *utf16;
 	int utf16_len;
@@ -487,7 +487,7 @@ static PHP_FUNCTION(json_decode)
         RETURN_NULL();
     }
 
-	php_json_decode(return_value, parameter, parameter_len, assoc);
+	php_json_decode(return_value, parameter, parameter_len, assoc TSRMLS_CC);
 }
 /* }}} */
 
diff --git a/ext/json/php_json.h b/ext/json/php_json.h
index ed2d486046..c022be7e58 100644
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -45,7 +45,7 @@ extern zend_module_entry json_module_entry;
 #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 */