- less custom macro cruft

[m6w6/ext-http] / php_http_object.h

diff --git a/php_http_object.h b/php_http_object.h
index 0ebd33cc03a99509cf93b408c20979f12ea6c534..7c88f209c2733b262a350090841cf0f6e75c0f73 100644 (file)
--- a/php_http_object.h
+++ b/php_http_object.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2013, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -19,10 +19,10 @@ PHP_HTTP_API STATUS php_http_new(zend_object_value *ov, zend_class_entry *ce, ph
 
 typedef struct php_http_object {
        zend_object zo;
+       zend_object_value zv;
 } php_http_object_t;
 
-zend_class_entry *php_http_object_get_class_entry(void);
-
+PHP_HTTP_API zend_class_entry *php_http_object_class_entry;
 PHP_MINIT_FUNCTION(http_object);
 
 zend_object_value php_http_object_new(zend_class_entry *ce TSRMLS_DC);
@@ -30,12 +30,6 @@ zend_object_value php_http_object_new_ex(zend_class_entry *ce, void *nothing, ph
 
 PHP_HTTP_API zend_error_handling_t php_http_object_get_error_handling(zval *object TSRMLS_DC);
 
-PHP_METHOD(HttpObject, setErrorHandling);
-PHP_METHOD(HttpObject, getErrorHandling);
-PHP_METHOD(HttpObject, setDefaultErrorHandling);
-PHP_METHOD(HttpObject, getDefaultErrorHandling);
-PHP_METHOD(HttpObject, triggerError);
-
 #endif