Skip to content

P
protobuf
Unverified Commit e69c9396 authored by Paul Yang's avatar Paul Yang Committed by GitHub
Browse files
Options

Extern declare protobuf_globals (#6946)

parent ab5b61bf
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
php/ext/google/protobuf/protobuf.c
View file @ e69c9396
...@@ -39,6 +39,8 @@ static PHP_RSHUTDOWN_FUNCTION(protobuf); ...@@ -39,6 +39,8 @@ static PHP_RSHUTDOWN_FUNCTION(protobuf);
static PHP_MINIT_FUNCTION(protobuf); static PHP_MINIT_FUNCTION(protobuf);
static PHP_MSHUTDOWN_FUNCTION(protobuf); static PHP_MSHUTDOWN_FUNCTION(protobuf);
ZEND_DECLARE_MODULE_GLOBALS(protobuf)
// Global map from upb {msg,enum}defs to wrapper Descriptor/EnumDescriptor // Global map from upb {msg,enum}defs to wrapper Descriptor/EnumDescriptor
// instances. // instances.
static HashTable* upb_def_to_php_obj_map; static HashTable* upb_def_to_php_obj_map;
......
php/ext/google/protobuf/protobuf.h
View file @ e69c9396
...@@ -689,7 +689,7 @@ ZEND_BEGIN_MODULE_GLOBALS(protobuf) ...@@ -689,7 +689,7 @@ ZEND_BEGIN_MODULE_GLOBALS(protobuf)
zend_bool keep_descriptor_pool_after_request; zend_bool keep_descriptor_pool_after_request;
ZEND_END_MODULE_GLOBALS(protobuf) ZEND_END_MODULE_GLOBALS(protobuf)
ZEND_DECLARE_MODULE_GLOBALS(protobuf) ZEND_EXTERN_MODULE_GLOBALS(protobuf)
#ifdef ZTS #ifdef ZTS
#define PROTOBUF_G(v) TSRMG(protobuf_globals_id, zend_protobuf_globals *, v) #define PROTOBUF_G(v) TSRMG(protobuf_globals_id, zend_protobuf_globals *, v)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment