diff options
| author | unknown <SergeyV@selena.> | 2006-01-23 20:01:05 +0300 |
|---|---|---|
| committer | unknown <SergeyV@selena.> | 2006-01-23 20:01:05 +0300 |
| commit | 5ad643b303284d79850e32bba1f1890ad146297c (patch) | |
| tree | 172a247116aec8e2a027c472f98912ec3004bced | |
| parent | a04dbbaf833b21b1882a332b54d0b19214331cf3 (diff) | |
| parent | 154f8c24ac2208870b34bc2493a137f5c418c116 (diff) | |
| download | mariadb-git-5ad643b303284d79850e32bba1f1890ad146297c.tar.gz | |
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into selena.:H:/MYSQL/src/#15787-mysql-5.0
| -rw-r--r-- | zlib/gzio.c | 4 | ||||
| -rw-r--r-- | zlib/zconf.h | 4 |
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. |