diff options
| author | unknown <SergeyV@selena.> | 2006-01-23 21:35:11 +0300 |
|---|---|---|
| committer | unknown <SergeyV@selena.> | 2006-01-23 21:35:11 +0300 |
| commit | 03ad365b00c446a6da418cb9112448449f2e5a45 (patch) | |
| tree | c6ee04935143d410d62fc996338c240b8fdb69f6 /zlib | |
| parent | 4032f5acd5ec6fbfc1d33a1782f4a5f022fddfad (diff) | |
| download | mariadb-git-03ad365b00c446a6da418cb9112448449f2e5a45.tar.gz | |
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
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/Makefile.am | 2 | ||||
| -rw-r--r-- | zlib/README.MySQL | 9 | ||||
| -rw-r--r-- | zlib/zconf.h | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 11b1991fa62..71619ce40c1 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -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 diff --git a/zlib/README.MySQL b/zlib/README.MySQL index 355dfb62d71..c17d3eeb6f9 100644 --- a/zlib/README.MySQL +++ b/zlib/README.MySQL @@ -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 + diff --git a/zlib/zconf.h b/zlib/zconf.h index f786a20a6f9..d983fa3eed4 100644 --- a/zlib/zconf.h +++ b/zlib/zconf.h @@ -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 |