From: Wolfgang Denk <wd@denx.de>
Date: Sat, 5 Dec 2009 23:53:18 +0000 (+0100)
Subject: zlib.c: avoid build conflicts for cradle board
X-Git-Tag: v2009.11-rc2~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a9f99ab44b473fb394169ba365f8b4380f981584;p=u-boot

zlib.c: avoid build conflicts for cradle board

Commit dce3d79710 updated the zlib code to v0.95; this caused
conflicts when building for the "cradle" board, because the (pretty
generic) preprocessor variable "OFF" was used in multiple files.
Make sure to avoid further conflicts by #undef'ing it in zlib.c
before redefining it.

Signed-off-by: Wolfgang Denk <wd@denx.de>
cc: Giuseppe Condorelli <giuseppe.condorelli@st.com>
cc: Angelo Castello <angelo.castello@st.com>
cc: Alessandro Rubini <rubini-list@gnudd.com>
---

diff --git a/lib_generic/zlib.c b/lib_generic/zlib.c
index 8fe3bd0dd1..ef1fa22806 100644
--- a/lib_generic/zlib.c
+++ b/lib_generic/zlib.c
@@ -28,6 +28,8 @@
 
 #include "u-boot/zlib.h"
 #include <common.h>
+#undef	OFF				/* avoid conflicts */
+
 /* To avoid a build time warning */
 #ifdef STDC
 #include <malloc.h>