diff options
| author |  Stanley Cheung <stanley.cheung@gmail.com> | 2016-10-04 13:39:51 -0700 |
|---|---|---|
| committer |  Bo Yang <teboring@google.com> | 2016-10-10 11:44:54 -0700 |
| commit | 1e5d4ba9387362ece026e78148f4ac5881537e64 (patch) | |
| tree | adf8537822e5e4982c0358bb218bf7992aceeb01 /php/ext/google/protobuf/message.c | |
| parent | c96dd669a9da2b2c44c9c54313c61ee06791aa79 (diff) | |
PHP: fix ZTS tsrm_ls errors (#2189)
* PHP: fix ZTS tsrm_ls errors
* Fix a few more macros
Diffstat (limited to 'php/ext/google/protobuf/message.c')
| -rw-r--r-- | php/ext/google/protobuf/message.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/php/ext/google/protobuf/message.c b/php/ext/google/protobuf/message.c index 0cae6dba..cb46031e 100644 --- a/php/ext/google/protobuf/message.c +++ b/php/ext/google/protobuf/message.c @@ -96,7 +96,7 @@ static void message_set_property(zval* object, zval* member, zval* value, zend_error(E_USER_ERROR, "Unknown field: %s", Z_STRVAL_P(member)); } - layout_set(self->descriptor->layout, self, field, value); + layout_set(self->descriptor->layout, self, field, value TSRMLS_CC); } static zval* message_get_property(zval* object, zval* member, int type, @@ -177,7 +177,8 @@ static zend_object_value message_create(zend_class_entry* ce TSRMLS_DC) { zend_object_std_init(&msg->std, ce TSRMLS_CC); object_properties_init(&msg->std, ce); - layout_init(desc->layout, message_data(msg), msg->std.properties_table); + layout_init(desc->layout, message_data(msg), msg->std.properties_table + TSRMLS_CC); return_value.handle = zend_objects_store_put( msg, (zend_objects_store_dtor_t)zend_objects_destroy_object, message_free, |