X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=e79a9b0be29dd9d6dfef22aec7c8aa3e867692eb;hp=a0f7ddf7b4d40104e1135436e6c02d0bb1961d43;hb=e006146f6dc8601b2123d10e87311d06325231e7;hpb=0ac32c9b8590e88a5f110cc8b3154001d5c0c089

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index a0f7ddf..e79a9b0 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -83,31 +83,34 @@ typedef int STATUS;
 #define array_merge(src, dst)	zend_hash_merge(Z_ARRVAL_P(dst), Z_ARRVAL_P(src), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *), 1)
 /* }}} */
 
+#define HTTP_LONG_CONSTANT(name, const) REGISTER_LONG_CONSTANT(name, const, CONST_CS | CONST_PERSISTENT);
+
 /* {{{ objects & properties */
 #ifdef ZEND_ENGINE_2
 
+
 #	define HTTP_REGISTER_CLASS_EX(classname, name, parent, flags) \
 	{ \
 		zend_class_entry ce; \
-		INIT_CLASS_ENTRY(ce, #classname, name## _class_methods); \
-		ce.create_object = name## _new_object; \
+		INIT_CLASS_ENTRY(ce, #classname, name## _fe); \
+		ce.create_object = name## _new; \
 		name## _ce = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
 		name## _ce->ce_flags |= flags;  \
-		memcpy(& name## _object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \
-		name## _object_handlers.clone_obj = NULL; \
-		name## _declare_default_properties(name## _ce); \
+		memcpy(& name## _handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \
+		name## _declare_default_properties(); \
 	}
 
 #	define HTTP_REGISTER_CLASS(classname, name, parent, flags) \
 	{ \
 		zend_class_entry ce; \
-		INIT_CLASS_ENTRY(ce, #classname, name## _class_methods); \
+		INIT_CLASS_ENTRY(ce, #classname, name## _fe); \
 		ce.create_object = NULL; \
 		name## _ce = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
 		name## _ce->ce_flags |= flags;  \
 	}
 
-#	define getObject(t, o) t * o = ((t *) zend_object_store_get_object(getThis() TSRMLS_CC))
+#	define getObject(t, o) getObjectEx(t, o, getThis())
+#	define getObjectEx(t, o, v) t * o = ((t *) zend_object_store_get_object(v TSRMLS_CC))
 #	define OBJ_PROP(o) o->zo.properties
 #	define DCL_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a) TSRMLS_CC)
 #	define DCL_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a) TSRMLS_CC)