[Solidircd-CVS] solidircd-stable/zlib Makefile, 1.7, 1.8 zconf.h, 1.44, 1.45

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/solidircd/solidircd-stable/zlib
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32644/zlib

Modified Files:
	Makefile zconf.h 
Log Message:
compile fixes

Index: zconf.h
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/zlib/zconf.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** zconf.h	10 Apr 2007 20:13:08 -0000	1.44
--- zconf.h	10 Apr 2007 21:16:55 -0000	1.45
***************
*** 1,4 ****
  /* zconf.h -- configuration of the zlib compression library
!  * Copyright (C) 1995-2003 Jean-loup Gailly.
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
--- 1,4 ----
  /* zconf.h -- configuration of the zlib compression library
!  * Copyright (C) 1995-2005 Jean-loup Gailly.
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
***************
*** 14,54 ****
   */
  #ifdef Z_PREFIX
! #  define deflateInit_  z_deflateInit_
! #  define deflate       z_deflate
! #  define deflateEnd    z_deflateEnd
! #  define inflateInit_  z_inflateInit_
! #  define inflate       z_inflate
! #  define inflateEnd    z_inflateEnd
! #  define deflateInit2_ z_deflateInit2_
! #  define deflateSetDictionary z_deflateSetDictionary
! #  define deflateCopy   z_deflateCopy
! #  define deflateReset  z_deflateReset
! #  define deflatePrime  z_deflatePrime
! #  define deflateParams z_deflateParams
! #  define deflateBound  z_deflateBound
! #  define inflateInit2_ z_inflateInit2_
! #  define inflateSetDictionary z_inflateSetDictionary
! #  define inflateSync   z_inflateSync
! #  define inflateSyncPoint z_inflateSyncPoint
! #  define inflateCopy   z_inflateCopy
! #  define inflateReset  z_inflateReset
! #  define compress      z_compress
! #  define compress2     z_compress2
! #  define compressBound z_compressBound
! #  define uncompress    z_uncompress
! #  define adler32       z_adler32
! #  define crc32         z_crc32
! #  define get_crc_table z_get_crc_table

! #  define Byte          z_Byte
! #  define uInt          z_uInt
! #  define uLong         z_uLong
! #  define Bytef         z_Bytef
! #  define charf         z_charf
! #  define intf          z_intf
! #  define uIntf         z_uIntf
! #  define uLongf        z_uLongf
! #  define voidpf        z_voidpf
! #  define voidp         z_voidp
  #endif

--- 14,61 ----
   */
  #ifdef Z_PREFIX
! #  define deflateInit_          z_deflateInit_
! #  define deflate               z_deflate
! #  define deflateEnd            z_deflateEnd
! #  define inflateInit_          z_inflateInit_
! #  define inflate               z_inflate
! #  define inflateEnd            z_inflateEnd
! #  define deflateInit2_         z_deflateInit2_
! #  define deflateSetDictionary  z_deflateSetDictionary
! #  define deflateCopy           z_deflateCopy
! #  define deflateReset          z_deflateReset
! #  define deflateParams         z_deflateParams
! #  define deflateBound          z_deflateBound
! #  define deflatePrime          z_deflatePrime
! #  define inflateInit2_         z_inflateInit2_
! #  define inflateSetDictionary  z_inflateSetDictionary
! #  define inflateSync           z_inflateSync
! #  define inflateSyncPoint      z_inflateSyncPoint
! #  define inflateCopy           z_inflateCopy
! #  define inflateReset          z_inflateReset
! #  define inflateBack           z_inflateBack
! #  define inflateBackEnd        z_inflateBackEnd
! #  define compress              z_compress
! #  define compress2             z_compress2
! #  define compressBound         z_compressBound
! #  define uncompress            z_uncompress
! #  define adler32               z_adler32
! #  define crc32                 z_crc32
! #  define get_crc_table         z_get_crc_table
! #  define zError                z_zError

! #  define alloc_func            z_alloc_func
! #  define free_func             z_free_func
! #  define in_func               z_in_func
! #  define out_func              z_out_func
! #  define Byte                  z_Byte
! #  define uInt                  z_uInt
! #  define uLong                 z_uLong
! #  define Bytef                 z_Bytef
! #  define charf                 z_charf
! #  define intf                  z_intf
! #  define uIntf                 z_uIntf
! #  define uLongf                z_uLongf
! #  define voidpf                z_voidpf
! #  define voidp                 z_voidp
  #endif

***************
*** 62,67 ****
  #  define WINDOWS
  #endif
! #if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
! #  define WIN32
  #endif
  #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
--- 69,76 ----
  #  define WINDOWS
  #endif
! #if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
! #  ifndef WIN32
! #    define WIN32
! #  endif
  #endif
  #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
***************
*** 276,280 ****
  #endif

! #if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
  #  include <sys/types.h> /* for off_t */
  #  include <unistd.h>    /* for SEEK_* and off_t */
--- 285,289 ----
  #endif

! #if 1           /* HAVE_UNISTD_H -- this line is updated by ./configure */
  #  include <sys/types.h> /* for off_t */
  #  include <unistd.h>    /* for SEEK_* and off_t */
***************
*** 282,286 ****
  #    include <unixio.h>   /* for off_t */
  #  endif
! #  define z_off_t  off_t
  #endif
  #ifndef SEEK_SET
--- 291,295 ----
  #    include <unixio.h>   /* for off_t */
  #  endif
! #  define z_off_t off_t
  #endif
  #ifndef SEEK_SET
***************
*** 290,298 ****
  #endif
  #ifndef z_off_t
! #  define  z_off_t long
  #endif

  #if defined(__OS400__)
! #define NO_vsnprintf
  #endif

--- 299,307 ----
  #endif
  #ifndef z_off_t
! #  define z_off_t long
  #endif

  #if defined(__OS400__)
! #  define NO_vsnprintf
  #endif

Index: Makefile
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/zlib/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile	26 Mar 2006 17:27:08 -0000	1.7
--- Makefile	10 Apr 2007 21:16:55 -0000	1.8
***************
*** 17,23 ****
  #    make install prefix=$HOME

! CC=cc

! CFLAGS=-O
  #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
  #CFLAGS=-g -DDEBUG
--- 17,23 ----
  #    make install prefix=$HOME

! CC=gcc

! CFLAGS=-O3 -DUSE_MMAP
  #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
  #CFLAGS=-g -DDEBUG
***************
*** 25,35 ****
  #           -Wstrict-prototypes -Wmissing-prototypes

! LDFLAGS=libz.a
! LDSHARED=$(CC)
! CPP=$(CC) -E

  LIBS=libz.a
  SHAREDLIB=libz.so
! SHAREDLIBV=libz.so.1.2.1
  SHAREDLIBM=libz.so.1

--- 25,35 ----
  #           -Wstrict-prototypes -Wmissing-prototypes

! LDFLAGS=-L. libz.a
! LDSHARED=gcc
! CPP=gcc -E

  LIBS=libz.a
  SHAREDLIB=libz.so
! SHAREDLIBV=libz.so.1.2.3
  SHAREDLIBM=libz.so.1

***************
*** 40,48 ****
  EXE=

! prefix = /usr/local
! exec_prefix = ${prefix}
! libdir = ${exec_prefix}/lib
! includedir = ${prefix}/include
! mandir = ${prefix}/share/man
  man3dir = ${mandir}/man3

--- 40,48 ----
  EXE=

! prefix =/usr/local
! exec_prefix =${prefix}
! libdir =${exec_prefix}/lib
! includedir =${prefix}/include
! mandir =${prefix}/share/man
  man3dir = ${mandir}/man3