commit e69c939652b819631dea1070266258dbc70f9497
author Paul Yang <TeBoring@users.noreply.github.com> Wed Nov 27 01:00:51 2019 -0800
committer GitHub <noreply@github.com> Wed Nov 27 01:00:51 2019 -0800
tree 6516a9932114c7d3e1564a1f3d448ddc29f17316
parent ab5b61bf2f0fb1ac485be1b82fffca153c2509ed

Extern declare protobuf_globals (#6946)

php/ext/google/protobuf/protobuf.c

diff --git a/php/ext/google/protobuf/protobuf.c b/php/ext/google/protobuf/protobuf.c
index c635189..52cdac8 100644
--- a/php/ext/google/protobuf/protobuf.c
+++ b/php/ext/google/protobuf/protobuf.c
@@ -39,6 +39,8 @@
 static PHP_MINIT_FUNCTION(protobuf);
 static PHP_MSHUTDOWN_FUNCTION(protobuf);
 
+ZEND_DECLARE_MODULE_GLOBALS(protobuf)
+
 // Global map from upb {msg,enum}defs to wrapper Descriptor/EnumDescriptor
 // instances.
 static HashTable* upb_def_to_php_obj_map;

php/ext/google/protobuf/protobuf.h

diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h
index 390e736..059ee55 100644
--- a/php/ext/google/protobuf/protobuf.h
+++ b/php/ext/google/protobuf/protobuf.h
@@ -689,7 +689,7 @@
   zend_bool keep_descriptor_pool_after_request;
 ZEND_END_MODULE_GLOBALS(protobuf)
 
-ZEND_DECLARE_MODULE_GLOBALS(protobuf)
+ZEND_EXTERN_MODULE_GLOBALS(protobuf)
 
 #ifdef ZTS
 #define PROTOBUF_G(v) TSRMG(protobuf_globals_id, zend_protobuf_globals *, v)