diff options
| author | Michael Wallner <mike@php.net> | 2015-02-09 17:57:05 +0100 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2015-02-09 17:57:18 +0100 |
| commit | 09a3e7377a30cad769b5c92254e101a32ab77731 (patch) | |
| tree | a1b208f9c3190076588a719977eaf1302984ed1b /ext | |
| parent | 9ff3800b79e9fe69ae821d18e23b2f0a156a100c (diff) | |
| download | php-git-09a3e7377a30cad769b5c92254e101a32ab77731.tar.gz | |
fix json globals
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/json/json_encoder.c | 2 | ||||
| -rw-r--r-- | ext/json/php_json.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c index 8fabf77d83..c66f3d5d27 100644 --- a/ext/json/json_encoder.c +++ b/ext/json/json_encoder.c @@ -39,8 +39,6 @@ #define PHP_JSON_DOUBLE_MAX_LENGTH 1080 #endif -ZEND_DECLARE_MODULE_GLOBALS(json) - static const char digits[] = "0123456789abcdef"; static void php_json_escape_string(smart_str *buf, char *s, size_t len, int options); diff --git a/ext/json/php_json.h b/ext/json/php_json.h index 65ae830808..5bc2cfab0e 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -80,6 +80,7 @@ ZEND_BEGIN_MODULE_GLOBALS(json) php_json_error_code error_code; ZEND_END_MODULE_GLOBALS(json) +ZEND_EXTERN_MODULE_GLOBALS(json); #ifdef ZTS # define JSON_G(v) ZEND_TSRMG(json_globals_id, zend_json_globals *, v) |