archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix json globals

Browse source
This commit is contained in:
Michael Wallner 2015-02-09 17:57:05 +01:00
parent 9ff3800b79
commit 09a3e7377a
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/json/json_encoder.c
View file

@ -39,8 +39,6 @@
#define PHP_JSON_DOUBLE_MAX_LENGTH 1080 #define PHP_JSON_DOUBLE_MAX_LENGTH 1080
#endif #endif
ZEND_DECLARE_MODULE_GLOBALS(json)
static const char digits[] = "0123456789abcdef"; static const char digits[] = "0123456789abcdef";
static void php_json_escape_string(smart_str *buf, char *s, size_t len, int options); static void php_json_escape_string(smart_str *buf, char *s, size_t len, int options);

1
ext/json/php_json.h
View file

@ -80,6 +80,7 @@ ZEND_BEGIN_MODULE_GLOBALS(json)
php_json_error_code error_code; php_json_error_code error_code;
ZEND_END_MODULE_GLOBALS(json) ZEND_END_MODULE_GLOBALS(json)
ZEND_EXTERN_MODULE_GLOBALS(json);
#ifdef ZTS #ifdef ZTS
# define JSON_G(v) ZEND_TSRMG(json_globals_id, zend_json_globals *, v) # define JSON_G(v) ZEND_TSRMG(json_globals_id, zend_json_globals *, v)