MFH

diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h
index 65e45fac30dfc79f0b522f40ab6ff030ee4f04bf..5e49ab5acc281544095f33722b77b1350299400a 100644 (file)
--- a/ext/zlib/php_zlib.h
+++ b/ext/zlib/php_zlib.h
@@ -54,7 +54,7 @@ PHP_FUNCTION(gzencode);
 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;

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 21beccc6711b737cfe94219b0402840dbc31e106..7997839502f2792e543d6ae4be37f8c37982013c 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -892,7 +892,7 @@ PHP_FUNCTION(gzencode)
 
 /* {{{ 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)) {

diff --git a/main/output.c b/main/output.c
index 8a5cfe6cbbd1d15aff63283455bb05c0b3409335..2a170b56785c785419dc9128d5d35178bc7ebf5b 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -409,7 +409,7 @@ static int php_ob_init_named(uint initial_size, uint block_size, char *handler_n
 {
        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