X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=e79a9b0be29dd9d6dfef22aec7c8aa3e867692eb;hp=4d9523d8a49a628ac0fa67428211fe80ff00f5a1;hb=e006146f6dc8601b2123d10e87311d06325231e7;hpb=8cb7ee1e8d8093d21ad9120b342a7ce1effa3694 diff --git a/php_http_std_defs.h b/php_http_std_defs.h index 4d9523d..e79a9b0 100644 --- a/php_http_std_defs.h +++ b/php_http_std_defs.h @@ -83,25 +83,27 @@ 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; \