summaryrefslogtreecommitdiff
path: root/zlib
diff options
context:
space:
mode:
authorunknown <SergeyV@selena.>2006-01-12 17:32:39 +0300
committerunknown <SergeyV@selena.>2006-01-12 17:32:39 +0300
commit988584f0dde5433f286d5a1d2740c1f73314cb86 (patch)
tree3881e4468cb42cb2d2e1c0fe20a518e418139872 /zlib
parent35d46cee7c1114893cb9cccefa2113aee22ad8dd (diff)
downloadmariadb-git-988584f0dde5433f286d5a1d2740c1f73314cb86.tar.gz
Fixes bug #15787. Fix makes available _FILE_OFFSET_BITS definition for
zlib library in order to enable support of files larger than 2Gb. Providing an effective test is hardly possible, since the problem starts only when archive table becomes larger than 2Gb. zlib/gzio.c: Move include of zutil.h on top of gzio.c to include chain of zutil.h->zlib.h->zconf.h->config.h before including anything else. zlib/zconf.h: Includes config.h in order to make _FILE_OFFSET_BITS definition available.
Diffstat (limited to 'zlib')
-rw-r--r--zlib/gzio.c4
-rw-r--r--zlib/zconf.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/zlib/gzio.c b/zlib/gzio.c
index 7e90f4928fc..afac5352323 100644
--- a/zlib/gzio.c
+++ b/zlib/gzio.c
@@ -7,10 +7,10 @@
/* @(#) $Id$ */
-#include <stdio.h>
-
#include "zutil.h"
+#include <stdio.h>
+
#ifdef NO_DEFLATE /* for compatibility with old definition */
# define NO_GZCOMPRESS
#endif
diff --git a/zlib/zconf.h b/zlib/zconf.h
index 03a9431c8be..f786a20a6f9 100644
--- a/zlib/zconf.h
+++ b/zlib/zconf.h
@@ -8,6 +8,10 @@
#ifndef ZCONF_H
#define ZCONF_H
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
/*
* 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.