diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /Zend/zend_objects_API.h | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'Zend/zend_objects_API.h')
| -rw-r--r-- | Zend/zend_objects_API.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Zend/zend_objects_API.h b/Zend/zend_objects_API.h index 362d79a68c..741bb82899 100644 --- a/Zend/zend_objects_API.h +++ b/Zend/zend_objects_API.h @@ -37,7 +37,7 @@ } while (0) -#define OBJ_RELEASE(obj) zend_object_release(obj TSRMLS_CC) +#define OBJ_RELEASE(obj) zend_object_release(obj) typedef struct _zend_objects_store { zend_object **object_buckets; @@ -49,34 +49,34 @@ typedef struct _zend_objects_store { /* Global store handling functions */ BEGIN_EXTERN_C() ZEND_API void zend_objects_store_init(zend_objects_store *objects, uint32_t init_size); -ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TSRMLS_DC); -ZEND_API void zend_objects_store_mark_destructed(zend_objects_store *objects TSRMLS_DC); +ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects); +ZEND_API void zend_objects_store_mark_destructed(zend_objects_store *objects); ZEND_API void zend_objects_store_destroy(zend_objects_store *objects); /* Store API functions */ -ZEND_API void zend_objects_store_put(zend_object *object TSRMLS_DC); -ZEND_API void zend_objects_store_del(zend_object *object TSRMLS_DC); -ZEND_API void zend_objects_store_free(zend_object *object TSRMLS_DC); +ZEND_API void zend_objects_store_put(zend_object *object); +ZEND_API void zend_objects_store_del(zend_object *object); +ZEND_API void zend_objects_store_free(zend_object *object); /* See comment in zend_objects_API.c before you use this */ -ZEND_API void zend_object_store_set_object(zval *zobject, zend_object *object TSRMLS_DC); -ZEND_API void zend_object_store_ctor_failed(zend_object *object TSRMLS_DC); +ZEND_API void zend_object_store_set_object(zval *zobject, zend_object *object); +ZEND_API void zend_object_store_ctor_failed(zend_object *object); -ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects TSRMLS_DC); +ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects); #define ZEND_OBJECTS_STORE_HANDLERS 0, zend_object_std_dtor, zend_objects_destroy_object, zend_objects_clone_obj -ZEND_API zend_object *zend_object_create_proxy(zval *object, zval *member TSRMLS_DC); +ZEND_API zend_object *zend_object_create_proxy(zval *object, zval *member); ZEND_API zend_object_handlers *zend_get_std_object_handlers(void); END_EXTERN_C() -static zend_always_inline void zend_object_release(zend_object *obj TSRMLS_DC) +static zend_always_inline void zend_object_release(zend_object *obj) { if (--GC_REFCOUNT(obj) == 0) { - zend_objects_store_del(obj TSRMLS_CC); + zend_objects_store_del(obj); } else if (UNEXPECTED(!GC_INFO(obj))) { - gc_possible_root(&obj->gc TSRMLS_CC); + gc_possible_root(&obj->gc); } } |