Commit 4032f5ac authored Jan 23, 2006 by unknown

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

into  selena.:H:/MYSQL/src/#15787-mysql-5.0

parents dde3f727 988584f0

zlib/gzio.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

zlib/zconf.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -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.