return_value->is_ref = 1; \
return_value->type = IS_OBJECT; \
return_value->value.obj = (ov); \
- zval_add_ref(&return_value); \
zend_objects_store_add_ref(return_value TSRMLS_CC)
#define RETURN_OBJVAL(ov) \
RETVAL_OBJVAL(ov); \
name## _ce = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
name## _ce->ce_flags |= flags; \
memcpy(& name## _handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \
+ zend_hash_init(& name## _ce->constants_table, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1); \
name## _declare_default_properties(); \
}
# define GET_PROP(o, n) GET_PROP_EX(o, getThis(), n)
# define GET_PROP_EX(o, this, n) zend_read_property(o->zo.ce, this, (#n), sizeof(#n)-1, 0 TSRMLS_CC)
+# define DCL_CONST(t, n, v) zend_declare_class_constant_ ##t(ce, (n), sizeof(n), (v) TSRMLS_CC)
+
# define ACC_PROP_PRIVATE(ce, flags) ((flags & ZEND_ACC_PRIVATE) && (EG(scope) && ce == EG(scope))
# define ACC_PROP_PROTECTED(ce, flags) ((flags & ZEND_ACC_PROTECTED) && (zend_check_protected(ce, EG(scope))))
# define ACC_PROP_PUBLIC(flags) (flags & ZEND_ACC_PUBLIC)
# define E_THROW 0
#endif
#define HE_THROW E_THROW
-#define HE_NOTICE (HTTP_G(only_exceptions) ? E_THROW : E_NOTICE)
-#define HE_WARNING (HTTP_G(only_exceptions) ? E_THROW : E_WARNING)
-#define HE_ERROR (HTTP_G(only_exceptions) ? E_THROW : E_ERROR)
+#ifdef ZEND_ENGINE_2
+# define HE_NOTICE (HTTP_G(only_exceptions) ? E_THROW : E_NOTICE)
+# define HE_WARNING (HTTP_G(only_exceptions) ? E_THROW : E_WARNING)
+# define HE_ERROR (HTTP_G(only_exceptions) ? E_THROW : E_ERROR)
+#else
+# define HE_NOTICE E_NOTICE
+# define HE_WARNING E_WARNING
+# define HE_ERROR E_ERROR
+#endif
#define HTTP_E_RUNTIME 1L
#define HTTP_E_INVALID_PARAM 2L