summaryrefslogtreecommitdiff
path: root/zlib/zconf.h
diff options
context:
space:
mode:
authorunknown <SergeyV@selena.>2006-01-23 20:01:05 +0300
committerunknown <SergeyV@selena.>2006-01-23 20:01:05 +0300
commit4032f5acd5ec6fbfc1d33a1782f4a5f022fddfad (patch)
tree172a247116aec8e2a027c472f98912ec3004bced /zlib/zconf.h
parentdde3f7275ba4ed065f82e74be6d3f99bc671c176 (diff)
parent988584f0dde5433f286d5a1d2740c1f73314cb86 (diff)
downloadmariadb-git-4032f5acd5ec6fbfc1d33a1782f4a5f022fddfad.tar.gz
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into selena.:H:/MYSQL/src/#15787-mysql-5.0
Diffstat (limited to 'zlib/zconf.h')
-rw-r--r--zlib/zconf.h4
1 files changed, 4 insertions, 0 deletions
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.