| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
/* $Id$ */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#define HTTP_WANT_ZLIB
#include "php_http.h"
#include "php_http_exception_object.h"
#include "php_http_deflatestream_object.h"
-#define HTTP_BEGIN_ARGS(method, ret_ref, req_args) HTTP_BEGIN_ARGS_EX(HttpDeflateStream, method, ret_ref, req_args)
-#define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpDeflateStream, method, ret_ref)
-#define HTTP_DEFLATE_ME(method, visibility) PHP_ME(HttpDeflateStream, method, HTTP_ARGS(HttpDeflateStream, method), visibility)
+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpDeflateStream, method, 0, req_args)
+#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpDeflateStream, method, 0)
+#define HTTP_DEFLATE_ME(method, visibility) PHP_ME(HttpDeflateStream, method, HTTP_ARGS(HttpDeflateStream, method), visibility)
-HTTP_BEGIN_ARGS(__construct, 0, 0)
+HTTP_BEGIN_ARGS(__construct, 0)
HTTP_ARG_VAL(flags, 0)
HTTP_END_ARGS;
-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 http_deflatestream_object_declare_default_properties() _http_deflatestream_object_declare_default_properties(TSRMLS_C)
-static inline void _http_deflatestream_object_declare_default_properties(TSRMLS_D);
-
+#define OBJ_PROP_CE http_deflatestream_object_ce
zend_class_entry *http_deflatestream_object_ce;
zend_function_entry http_deflatestream_object_fe[] = {
HTTP_DEFLATE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
{
HTTP_REGISTER_CLASS_EX(HttpDeflateStream, http_deflatestream_object, NULL, 0);
http_deflatestream_object_handlers.clone_obj = _http_deflatestream_object_clone_obj;
+
+#ifndef WONKY
+ DCL_CONST(long, "TYPE_GZIP", HTTP_DEFLATE_TYPE_GZIP);
+ DCL_CONST(long, "TYPE_ZLIB", HTTP_DEFLATE_TYPE_ZLIB);
+ DCL_CONST(long, "TYPE_RAW", HTTP_DEFLATE_TYPE_RAW);
+ DCL_CONST(long, "LEVEL_DEF", HTTP_DEFLATE_LEVEL_DEF);
+ DCL_CONST(long, "LEVEL_MIN", HTTP_DEFLATE_LEVEL_MIN);
+ DCL_CONST(long, "LEVEL_MAX", HTTP_DEFLATE_LEVEL_MAX);
+ DCL_CONST(long, "STRATEGY_DEF", HTTP_DEFLATE_STRATEGY_DEF);
+ DCL_CONST(long, "STRATEGY_FILT", HTTP_DEFLATE_STRATEGY_FILT);
+ DCL_CONST(long, "STRATEGY_HUFF", HTTP_DEFLATE_STRATEGY_HUFF);
+ DCL_CONST(long, "STRATEGY_RLE", HTTP_DEFLATE_STRATEGY_RLE);
+ DCL_CONST(long, "STRATEGY_FIXED", HTTP_DEFLATE_STRATEGY_FIXED);
+#endif
+
return SUCCESS;
}
return http_deflatestream_object_new_ex(Z_OBJCE_P(this_ptr), s, NULL);
}
-static inline void _http_deflatestream_object_declare_default_properties(TSRMLS_D)
-{
- zend_class_entry *ce = http_deflatestream_object_ce;
-
-#ifndef WONKY
- DCL_CONST(long, "TYPE_GZIP", HTTP_DEFLATE_TYPE_GZIP);
- DCL_CONST(long, "TYPE_ZLIB", HTTP_DEFLATE_TYPE_ZLIB);
- DCL_CONST(long, "TYPE_RAW", HTTP_DEFLATE_TYPE_RAW);
- DCL_CONST(long, "LEVEL_DEF", HTTP_DEFLATE_LEVEL_DEF);
- DCL_CONST(long, "LEVEL_MIN", HTTP_DEFLATE_LEVEL_MIN);
- DCL_CONST(long, "LEVEL_MAX", HTTP_DEFLATE_LEVEL_MAX);
- DCL_CONST(long, "STRATEGY_DEF", HTTP_DEFLATE_STRATEGY_DEF);
- DCL_CONST(long, "STRATEGY_FILT", HTTP_DEFLATE_STRATEGY_FILT);
- DCL_CONST(long, "STRATEGY_HUFF", HTTP_DEFLATE_STRATEGY_HUFF);
- DCL_CONST(long, "STRATEGY_RLE", HTTP_DEFLATE_STRATEGY_RLE);
- DCL_CONST(long, "STRATEGY_FIXED", HTTP_DEFLATE_STRATEGY_FIXED);
-#endif
-}
-
void _http_deflatestream_object_free(zend_object *object TSRMLS_DC)
{
http_deflatestream_object *o = (http_deflatestream_object *) object;