Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Extern declare protobuf_globals (#6946)

Browse Source
pull/6972/head
Paul Yang 5 years ago committed by GitHub
parent ab5b61bf2f
commit e69c939652
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      php/ext/google/protobuf/protobuf.c
  2. 2
      php/ext/google/protobuf/protobuf.h

2
php/ext/google/protobuf/protobuf.c
Unescape View File

@ -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;

2
php/ext/google/protobuf/protobuf.h
Unescape View File

@ -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)

Write Preview
Loading…
Cancel
Save