diff options
| author |  Bo Yang <paulyang1211@gmail.com> | 2016-10-05 18:28:13 -0700 |
|---|---|---|
| committer |  Bo Yang <teboring@google.com> | 2016-10-10 11:44:54 -0700 |
| commit | 63448e6059ee5e7b123e0d185e70c1df1d294bd8 (patch) | |
| tree | 0ae4e5d5f68a5199d3594b972446a6566f4abc33 /php/ext/google/protobuf/protobuf.h | |
| parent | 4f3d20a500e75ef47004986fece3db20ddeee43f (diff) | |
Fix compile error for php on Mac.
Diffstat (limited to 'php/ext/google/protobuf/protobuf.h')
| -rw-r--r-- | php/ext/google/protobuf/protobuf.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 5edb15db..8a1d9261 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -70,14 +70,6 @@ typedef struct MapField MapField; ZEND_BEGIN_MODULE_GLOBALS(protobuf) ZEND_END_MODULE_GLOBALS(protobuf) -ZEND_DECLARE_MODULE_GLOBALS(protobuf) - -#ifdef ZTS -#define PROTOBUF_G(v) TSRMG(protobuf_globals_id, zend_protobuf_globals*, v) -#else -#define PROTOBUF_G(v) (protobuf_globals.v) -#endif - // Init module and PHP classes. void descriptor_init(TSRMLS_D); void enum_descriptor_init(TSRMLS_D); @@ -347,6 +339,7 @@ void* upb_value_memory(upb_value* v); // These operate on a map field (i.e., a repeated field of submessages whose // submessage type is a map-entry msgdef). +bool is_map_field(const upb_fielddef* field); const upb_fielddef* map_field_key(const upb_fielddef* field); const upb_fielddef* map_field_value(const upb_fielddef* field); |