X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_object.h;h=0d86883148ddae90a354574f229a1c781cd8df4b;hp=311f17f3a5525873e57b376655b739a84f45acdd;hb=HEAD;hpb=5aa292d5bc46cd8fe266d682397dba19dc1e1d36

diff --git a/src/php_pq_object.h b/src/php_pq_object.h
index 311f17f..0d86883 100644
--- a/src/php_pq_object.h
+++ b/src/php_pq_object.h
@@ -13,29 +13,61 @@
 #ifndef PHP_PQ_OBJECT_H
 #define PHP_PQ_OBJECT_H
 
-typedef struct php_pq_object {
+#define PHP_PQ_OBJ_DECL(_intern_type) \
+	_intern_type intern; \
+	HashTable *prophandler; \
+	HashTable gc; \
 	zend_object zo;
-	zend_object_value zv;
-	HashTable *prophandler;
-	void *intern;
+
+typedef struct php_pq_object {
+	PHP_PQ_OBJ_DECL(void *)
 } php_pq_object_t;
 
-typedef void (*php_pq_object_prophandler_func_t)(zval *object, void *o, zval *return_value TSRMLS_DC);
+static inline void *PHP_PQ_OBJ(zval *zv, zend_object *zo) {
+	if (zv) {
+		zo = Z_OBJ_P(zv);
+	}
+	return (void *) (((char *) zo) - zo->handlers->offset);
+}
+
+extern zend_class_entry *ancestor(zend_class_entry *ce);
+
+typedef void (*php_pq_object_prophandler_func_t)(void *o, zval *return_value);
 
 typedef struct php_pq_object_prophandler {
 	php_pq_object_prophandler_func_t read;
 	php_pq_object_prophandler_func_t write;
+	php_pq_object_prophandler_func_t gc;
 } php_pq_object_prophandler_t;
 
-void php_pq_object_to_zval(void *o, zval **zv TSRMLS_DC);
-void php_pq_object_to_zval_no_addref(void *o, zval **zv TSRMLS_DC);
-void php_pq_object_addref(void *o TSRMLS_DC);
-void php_pq_object_delref(void *o TSRMLS_DC);
-HashTable *php_pq_object_debug_info(zval *object, int *temp TSRMLS_DC);
-HashTable *php_pq_object_properties(zval *object TSRMLS_DC);
-zend_class_entry *ancestor(zend_class_entry *ce);
-zval *php_pq_object_read_prop(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC);
-void php_pq_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC);
+extern void php_pq_object_prophandler_dtor(zval *zv);
+
+extern void *php_pq_object_create(zend_class_entry *ce, void *intern, size_t obj_size, zend_object_handlers *oh, HashTable *ph);
+extern void php_pq_object_dtor(zend_object *obj);
+extern void php_pq_object_to_zval(void *o, zval *zv);
+extern void php_pq_object_to_zval_no_addref(void *o, zval *zv);
+extern void php_pq_object_addref(void *o);
+extern void php_pq_object_delref(void *o);
+
+#if PHP_VERSION_ID >= 80000
+extern HashTable *php_pq_object_debug_info(zend_object *object, int *temp);
+extern HashTable *php_pq_object_properties(zend_object *object);
+extern HashTable *php_pq_object_get_gc(zend_object *object, zval **table, int *n);
+extern zval *php_pq_object_read_prop(zend_object *object, zend_string *member, int type, void **cache_slot, zval *tmp);
+extern zval *php_pq_object_write_prop(zend_object *object, zend_string *member, zval *value, void **cache_slot);
+extern zval *php_pq_object_get_prop_ptr_null(zend_object *object, zend_string *member, int type, void **cache_slot);
+#else
+extern HashTable *php_pq_object_debug_info(zval *object, int *temp);
+extern HashTable *php_pq_object_properties(zval *object);
+extern HashTable *php_pq_object_get_gc(zval *object, zval **table, int *n);
+extern zval *php_pq_object_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *tmp);
+# if PHP_VERSION_ID >= 70400
+extern zval *php_pq_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot);
+# else
+extern void php_pq_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot);
+# endif
+extern zval *php_pq_object_get_prop_ptr_null(zval *object, zval *member, int type, void **cache_slot);
+#endif
 
 #endif