Commit 03ad365b authored by unknown's avatar unknown
Browse files

Changes after initial patch to #15787 


zlib/Makefile.am:
  Added a reference to ../include for my_config.h
zlib/README.MySQL:
  Updated a readme file to emphasize which files we what to keep an eye on
  in case of zlib upgrade.
zlib/zconf.h:
  restored a code for standard platform dependant definitions
parent 4032f5ac

zlib/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


# Process this file with automake to create Makefile.in



INCLUDES=		-I$(top_builddir)/include -I$(top_srcdir)/include



pkglib_LTLIBRARIES=libz.la



libz_la_LDFLAGS= -version-info 3:3:2

zlib/README.MySQL

+9 −0
Original line number Diff line number Diff line
@@ -5,3 +5,12 @@ original zlib distribution. You can find the original distribution at 
  http://www.gzip.org/zlib/ 

  or

  http://www.zlib.net/



Revision history:



20.01.2006. The following files were changed as part of #15787 fix:

 makefile.am

 gzio.c

 zconf.h

 README.mysql

zlib/zconf.h

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ typedef uLong FAR uLongf; 
   typedef Byte       *voidp;

#endif



#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */

#ifdef HAVE_UNISTD_H

#  include <sys/types.h> /* for off_t */

#  include <unistd.h>    /* for SEEK_* and off_t */

#  ifdef VMS