summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-05-01 12:31:02 +0000
committerWolfgang Denk <wd@denx.de>2011-05-12 19:30:29 +0200
commitf18185ab602b77d83610886d3a07f8eacfb12f23 (patch)
treed285cc15487105b08ec57b564e0605527d9d954a
parent0e0c0892a1fab6f93ba09d89ec3315f08f1b6ef4 (diff)
downloadu-boot-imx-f18185ab602b77d83610886d3a07f8eacfb12f23.zip
u-boot-imx-f18185ab602b77d83610886d3a07f8eacfb12f23.tar.gz
u-boot-imx-f18185ab602b77d83610886d3a07f8eacfb12f23.tar.bz2
zlib: fix DEBUG build
The previous commit imported a little too much from upstream. We need to disable stdio.h when using U-Boot. Reported-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--lib/zlib/zutil.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/zlib/zutil.h b/lib/zlib/zutil.h
index 46522c8..114cb74 100644
--- a/lib/zlib/zutil.h
+++ b/lib/zlib/zutil.h
@@ -91,7 +91,8 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
/* Diagnostic functions */
#ifdef DEBUG
-# include <stdio.h>
+/* Not valid for U-boot
+# include <stdio.h> */
extern int z_verbose;
extern void z_error OF((char *m));
# define Assert(cond,msg) {if(!(cond)) z_error(msg);}