com php-src: these need to be exported for extensions that use json: ext/json/json.c ext/json/php_json.h

Commit: 26e619b1923e481be5a281738835e4f92a44fbfe Author: Joe Watkins <krakjoe@php.net> Thu, 3 Sep 2015 19:28:34 +0100 Parents: 0f74baed9cc68e2e4ea8ac2d9b2834bd06daa3b5 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=26e619b1923e481be5a281738835e4f92a44fbfe Log: these need to be exported for extensions that use json Changed paths: M ext/json/json.c M ext/json/php_json.h Diff: diff --git a/ext/json/json.c b/ext/json/json.c index 79b9278..1d1f8ce 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -48,7 +48,7 @@ static PHP_FUNCTION(json_last_error_msg); PHP_JSON_API zend_class_entry *php_json_serializable_ce; -ZEND_DECLARE_MODULE_GLOBALS(json) +PHP_JSON_API ZEND_DECLARE_MODULE_GLOBALS(json) /* {{{ arginfo */ ZEND_BEGIN_ARG_INFO_EX(arginfo_json_encode, 0, 0, 1) diff --git a/ext/json/php_json.h b/ext/json/php_json.h index fccab62..4b315b8 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -81,7 +81,7 @@ ZEND_BEGIN_MODULE_GLOBALS(json) php_json_error_code error_code; ZEND_END_MODULE_GLOBALS(json) -ZEND_EXTERN_MODULE_GLOBALS(json); +PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json); #define JSON_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(json, v) #if defined(ZTS) && defined(COMPILE_DL_JSON)