summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-12-06 00:53:18 +0100
committerWolfgang Denk <wd@denx.de>2009-12-07 21:50:18 +0100
commita9f99ab44b473fb394169ba365f8b4380f981584 (patch)
treea900d27635b0aa20bf9ba56e12e4f95d5a2f50a0
parent8cbf4e4f17121d732e78764f0ba317c9a1838ea6 (diff)
downloadu-boot-imx-a9f99ab44b473fb394169ba365f8b4380f981584.zip
u-boot-imx-a9f99ab44b473fb394169ba365f8b4380f981584.tar.gz
u-boot-imx-a9f99ab44b473fb394169ba365f8b4380f981584.tar.bz2
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>
-rw-r--r--lib_generic/zlib.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib_generic/zlib.c b/lib_generic/zlib.c
index 8fe3bd0..ef1fa22 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>