*** misc/zlib-1.1.4/contrib/minizip/unzip.h	Wed Mar 18 17:15:00 1998
--- misc/build/zlib-1.1.4/contrib/minizip/unzip.h	Thu Jul  3 13:52:07 2003
***************
*** 46,52 ****
  #endif
  
  #ifndef _ZLIB_H
! #include "zlib.h"
  #endif
  
  #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
--- 46,52 ----
  #endif
  
  #ifndef _ZLIB_H
! #include "zlib/zlib.h"
  #endif
  
  #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
*** misc/zlib-1.1.4/makefile.mk	Thu Jul  3 14:12:13 2003
--- misc/build/zlib-1.1.4/makefile.mk	Thu Jul  3 13:52:07 2003
***************
*** 1 ****
! dummy
--- 1,53 ----
! #*************************************************************************
! #
! #   $RCSfile: makefile.mk,v $
! #
! #   $Revision: 1.8 $
! #
! #   last change: $Author: mtg $ $Date: 2000/11/09 10:19:32 $
! #
! #   Copyright according the GNU Public License.
! #
! #*************************************************************************
! 
! PRJ=..$/..$/..$/..
! 
! PRJNAME=zlib
! TARGET=zlib
! LIBTARGET=NO
! 
! # --- Settings -----------------------------------------------------
! 
! .INCLUDE :  settings.mk
! 
! # --- Files --------------------------------------------------------
! 
! INCEXT=contrib$/minizip
! 
! SLOFILES=	$(SLO)$/adler32.obj		\
! 			$(SLO)$/deflate.obj		\
! 			$(SLO)$/crc32.obj		\
! 			$(SLO)$/infblock.obj	\
! 			$(SLO)$/infcodes.obj	\
! 			$(SLO)$/inffast.obj		\
! 			$(SLO)$/inflate.obj		\
! 			$(SLO)$/inftrees.obj	\
! 			$(SLO)$/infutil.obj		\
! 			$(SLO)$/trees.obj		\
! 			$(SLO)$/zutil.obj       \
! 			$(SLO)$/unzip.obj
! 
! 
! LIB1TARGET=$(SLB)$/$(TARGET).lib
! LIB1ARCHIV=$(LB)$/lib$(TARGET).a
! LIB1OBJFILES=$(SLOFILES)
! 
! # --- Targets ------------------------------------------------------
! 
! .INCLUDE :  target.mk
! 
! $(MISC)$/%.c : contrib$/minizip$/%.c
! 	@echo ------------------------------
! 	@echo Making: $@
!     @+$(COPY) $< $@
! 
*** misc/zlib-1.1.4/zconf.h	Mon Mar 11 07:16:01 2002
--- misc/build/zlib-1.1.4/zconf.h	Thu Jul  3 13:52:07 2003
***************
*** 12,17 ****
--- 12,23 ----
   * If you *really* need a unique prefix for all types and library functions,
   * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
   */
+ /*
+  * we need the prefix to get the same names as in 1.1.3
+ */
+ 
+ #define Z_PREFIX
+ 
  #ifdef Z_PREFIX
  #  define deflateInit_	z_deflateInit_
  #  define deflate	z_deflate
*** misc/zlib-1.1.4/zlib.h	Mon Mar 11 07:56:38 2002
--- misc/build/zlib-1.1.4/zlib.h	Thu Jul  3 14:11:06 2003
***************
*** 27,33 ****
    Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
    (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
  */
- 
  #ifndef _ZLIB_H
  #define _ZLIB_H
  
--- 27,32 ----
***************
*** 168,174 ****
--- 167,175 ----
  
                          /* basic functions */
  
+ #if !defined(ZUTIL_PROTOS_OFF)
  ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+ #endif
  /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
     If the first character differs, the library code actually used is
     not compatible with the zlib.h header file used by the application.
***************
*** 882,888 ****
--- 883,891 ----
      struct internal_state {int dummy;}; /* hack for buggy compilers */
  #endif
  
+ #if !defined(ZUTIL_PROTOS_OFF)
  ZEXTERN const char   * ZEXPORT zError           OF((int err));
+ #endif
  ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
  ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
  
*** misc/zlib-1.1.4/zutil.c	Mon Mar 11 07:16:01 2002
--- misc/build/zlib-1.1.4/zutil.c	Thu Jul  3 14:11:34 2003
***************
*** 5,10 ****
--- 5,13 ----
  
  /* @(#) $Id$ */
  
+ #ifdef MACOSX
+ #define ZUTIL_PROTOS_OFF
+ #endif
  #include "zutil.h"
  
  struct internal_state      {int dummy;}; /* for buggy compilers */