From 09a3e7377a30cad769b5c92254e101a32ab77731 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 9 Feb 2015 17:57:05 +0100
Subject: [PATCH] fix json globals

---
 ext/json/json_encoder.c | 2 --
 ext/json/php_json.h     | 1 +
 2 files changed, 1 insertion(+), 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)
-- 
2.40.0