1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  selena.:H:/MYSQL/src/#15787-mysql-5.0
This commit is contained in:
SergeyV@selena. 2006-01-23 20:01:05 +03:00
commit 7390183d0f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zlib/gzio.c
View File

@ -7,10 +7,10 @@
/* @(#) $Id$ */ /* @(#) $Id$ */
#include <stdio.h>
#include "zutil.h" #include "zutil.h"
#include <stdio.h>
#ifdef NO_DEFLATE /* for compatibility with old definition */ #ifdef NO_DEFLATE /* for compatibility with old definition */
# define NO_GZCOMPRESS # define NO_GZCOMPRESS
#endif #endif

4
zlib/zconf.h
View File

@ -8,6 +8,10 @@
#ifndef ZCONF_H #ifndef ZCONF_H
#define 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, * 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. * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.