Extern declare protobuf_globals (#6946)

e69c9396 · Paul Yang · GitHub · ab5b61bf · e69c9396 · e69c9396
Unverified Commit e69c9396 authored Nov 27, 2019 by Paul Yang Committed by GitHub Nov 27, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

protobuf.c php/ext/google/protobuf/protobuf.c +2 -0

protobuf.h php/ext/google/protobuf/protobuf.h +1 -1

No files found.
--- a/php/ext/google/protobuf/protobuf.c
+++ b/php/ext/google/protobuf/protobuf.c
@@ -39,6 +39,8 @@ static PHP_RSHUTDOWN_FUNCTION(protobuf);
 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;

--- a/php/ext/google/protobuf/protobuf.h
+++ b/php/ext/google/protobuf/protobuf.h
@@ -689,7 +689,7 @@ ZEND_BEGIN_MODULE_GLOBALS(protobuf)
  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)