Re: cvs: php4 /ext/zlib zlib.c

Why does #including'ing php.h in the beginning break the build? On a whole, this is the right thing to do. Is anything defined there screwing up the build? Andi At 01:19 PM 10/23/00 +0000, Stanislav Malyshev wrote:

stas            Mon Oct 23 06:19:07 2000 EDT

Modified files:

    /php4/ext/zlib      zlib.c

Log: Make zlib compile again Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.58 php4/ext/zlib/zlib.c:1.59 --- php4/ext/zlib/zlib.c:1.58 Sat Oct 21 12:18:55 2000

+++ php4/ext/zlib/zlib.c        Mon Oct 23 06:19:07 2000

@@ -16,18 +16,19 @@

    |          Stefan Röhrich <sr@linux.de>                                |
    +----------------------------------------------------------------------+

*/ -/* $Id: zlib.c,v 1.58 2000/10/21 19:18:55 andi Exp $ */ +/* $Id: zlib.c,v 1.59 2000/10/23 13:19:07 stas Exp $ */ #define IS_EXT_MODULE -#include "php.h" +#include "php_config.h" #if HAVE_FOPENCOOKIE #define _GNU_SOURCE #define __USE_GNU -#include "libio.h" +#include <stdio.h> #endif -#include <stdio.h> +#include "php.h" + #include <stdlib.h> #include <errno.h> #include <sys/types.h> @@ -786,9 +787,10 @@ } static int gz_closer(void *cookie) {

-       gzclose(((struct gz_cookie *)cookie)->gz_file);
+       int ret=gzclose(((struct gz_cookie *)cookie)->gz_file);
        efree(cookie);
        cookie=NULL;
+       return ret;

} -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net For additional commands, e-mail: php-cvs-help@lists.php.net To contact the list administrators, e-mail: php-list-admin@lists.php.net

--- Andi Gutmans <andi@zend.com> http://www.zend.com/