[PHP-CVS] cvs: php4 /ext/zlib php_zlib.h zlib.c /main output.c

[Ilia Alshanetsky]

iliaa           Mon Dec 30 19:04:52 2002 EDT

  Modified files:              
    /php4/main  output.c 
    /php4/ext/zlib      zlib.c php_zlib.h 
  Log:
  Fix ZTS build.
  
  
Index: php4/main/output.c
diff -u php4/main/output.c:1.143 php4/main/output.c:1.144
--- php4/main/output.c:1.143    Mon Dec 30 14:39:30 2002
+++ php4/main/output.c  Mon Dec 30 19:04:51 2002
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: output.c,v 1.143 2002/12/30 19:39:30 iliaa Exp $ */
+/* $Id: output.c,v 1.144 2002/12/31 00:04:51 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.156 php4/ext/zlib/zlib.c:1.157
--- php4/ext/zlib/zlib.c:1.156  Mon Dec 30 14:39:31 2002
+++ php4/ext/zlib/zlib.c        Mon Dec 30 19:04:51 2002
@@ -18,7 +18,7 @@
    |          Jade Nicoletti <[EMAIL PROTECTED]>                           |
    +----------------------------------------------------------------------+
  */
-/* $Id: zlib.c,v 1.156 2002/12/30 19:39:31 iliaa Exp $ */
+/* $Id: zlib.c,v 1.157 2002/12/31 00:04:51 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.33 php4/ext/zlib/php_zlib.h:1.34
--- php4/ext/zlib/php_zlib.h:1.33       Mon Dec 30 14:39:31 2002
+++ php4/ext/zlib/php_zlib.h    Mon Dec 30 19:04:52 2002
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_zlib.h,v 1.33 2002/12/30 19:39:31 iliaa Exp $ */
+/* $Id: php_zlib.h,v 1.34 2002/12/31 00:04:52 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;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php