- ws

[m6w6/ext-http] / http_inflatestream_object.c

diff --git a/http_inflatestream_object.c b/http_inflatestream_object.c
index c107cd3c1ccd23a4de4db42edec5ecc202644893..c46a4f162b6e3919292780b9e202156141b505ca 100644 (file)
--- a/http_inflatestream_object.c
+++ b/http_inflatestream_object.c
@@ -12,11 +12,6 @@
 
 /* $Id$ */
 
-
-#ifdef HAVE_CONFIG_H
-#      include "config.h"
-#endif
-
 #define HTTP_WANT_ZLIB
 #include "php_http.h"
 
@@ -27,22 +22,23 @@
 #include "php_http_exception_object.h"
 #include "php_http_inflatestream_object.h"
 
-#define HTTP_BEGIN_ARGS(method, ret_ref, req_args)     HTTP_BEGIN_ARGS_EX(HttpInflateStream, method, ret_ref, req_args)
-#define HTTP_EMPTY_ARGS(method, ret_ref)                       HTTP_EMPTY_ARGS_EX(HttpInflateStream, method, ret_ref)
-#define HTTP_INFLATE_ME(method, visibility)                    PHP_ME(HttpInflateStream, method, HTTP_ARGS(HttpInflateStream, method), visibility)
+#define HTTP_BEGIN_ARGS(method, req_args)      HTTP_BEGIN_ARGS_EX(HttpInflateStream, method, 0, req_args)
+#define HTTP_EMPTY_ARGS(method)                                HTTP_EMPTY_ARGS_EX(HttpInflateStream, method, 0)
+#define HTTP_INFLATE_ME(method, visibility)    PHP_ME(HttpInflateStream, method, HTTP_ARGS(HttpInflateStream, method), visibility)
 
-HTTP_BEGIN_ARGS(update, 0, 1)
+HTTP_BEGIN_ARGS(update, 1)
        HTTP_ARG_VAL(data, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(flush, 0, 0)
+HTTP_BEGIN_ARGS(flush, 0)
        HTTP_ARG_VAL(data, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(finish, 0, 0)
+HTTP_BEGIN_ARGS(finish, 0)
        HTTP_ARG_VAL(data, 0)
 HTTP_END_ARGS;
 
+#define OBJ_PROP_CE http_inflatestream_object_ce
 zend_class_entry *http_inflatestream_object_ce;
 zend_function_entry http_inflatestream_object_fe[] = {
        HTTP_INFLATE_ME(update, ZEND_ACC_PUBLIC)
@@ -53,8 +49,6 @@ zend_function_entry http_inflatestream_object_fe[] = {
 };
 static zend_object_handlers http_inflatestream_object_handlers;
 
-static inline void http_inflatestream_object_declare_default_properties() { return; }
-
 PHP_MINIT_FUNCTION(http_inflatestream_object)
 {
        HTTP_REGISTER_CLASS_EX(HttpInflateStream, http_inflatestream_object, NULL, 0);