cvs: php4(PHP_4_3) /ext/zlib php_zlib.h zlib.c /main output.c

iliaa Mon Dec 30 19:05:19 2002 EDT Modified files: (Branch: PHP_4_3) /php4/main output.c /php4/ext/zlib zlib.c php_zlib.h Log: MFH Index: php4/main/output.c diff -u php4/main/output.c:1.142.2.1 php4/main/output.c:1.142.2.2 --- php4/main/output.c:1.142.2.1 Mon Dec 30 14:40:59 2002 +++ php4/main/output.c Mon Dec 30 19:05:19 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.142.2.1 2002/12/30 19:40:59 iliaa Exp $ */ +/* $Id: output.c,v 1.142.2.2 2002/12/31 00:05:19 iliaa Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -409,7 +409,7 @@ { if (OG(ob_nesting_level)>0) { #ifdef HAVE_ZLIB - if (!strncmp(handler_name, "ob_gzhandler", sizeof("ob_gzhandler")) && php_ob_gzhandler_check(TSRMLS_CC)) { + if (!strncmp(handler_name, "ob_gzhandler", sizeof("ob_gzhandler")) && php_ob_gzhandler_check(TSRMLS_C)) { return FAILURE; } #endif Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.153.2.2 php4/ext/zlib/zlib.c:1.153.2.3 --- php4/ext/zlib/zlib.c:1.153.2.2 Mon Dec 30 14:41:00 2002 +++ php4/ext/zlib/zlib.c Mon Dec 30 19:05:19 2002 @@ -18,7 +18,7 @@ | Jade Nicoletti <nicoletti@nns.ch> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.153.2.2 2002/12/30 19:41:00 iliaa Exp $ */ +/* $Id: zlib.c,v 1.153.2.3 2002/12/31 00:05:19 iliaa Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -892,7 +892,7 @@ /* {{{ php_ob_gzhandler_check */ -int php_ob_gzhandler_check(TSRMLS_DC) +int php_ob_gzhandler_check(TSRMLS_D) { /* check for wrong usages */ if (OG(ob_nesting_level>0)) { Index: php4/ext/zlib/php_zlib.h diff -u php4/ext/zlib/php_zlib.h:1.32.4.1 php4/ext/zlib/php_zlib.h:1.32.4.2 --- php4/ext/zlib/php_zlib.h:1.32.4.1 Mon Dec 30 14:41:00 2002 +++ php4/ext/zlib/php_zlib.h Mon Dec 30 19:05:19 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zlib.h,v 1.32.4.1 2002/12/30 19:41:00 iliaa Exp $ */ +/* $Id: php_zlib.h,v 1.32.4.2 2002/12/31 00:05:19 iliaa Exp $ */ #ifndef PHP_ZLIB_H #define PHP_ZLIB_H @@ -54,7 +54,7 @@ PHP_FUNCTION(ob_gzhandler); int php_enable_output_compression(int buffer_size TSRMLS_DC); -int php_ob_gzhandler_check(TSRMLS_DC); +int php_ob_gzhandler_check(TSRMLS_D); php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC); extern php_stream_ops php_stream_gzio_ops;