mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
first shot remove TSRMLS_* things
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user