diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-06 00:53:18 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-07 21:50:18 +0100 |
| commit | a9f99ab44b473fb394169ba365f8b4380f981584 (patch) | |
| tree | a900d27635b0aa20bf9ba56e12e4f95d5a2f50a0 /lib_generic | |
| parent | 8cbf4e4f17121d732e78764f0ba317c9a1838ea6 (diff) | |
| download | talos-obmc-uboot-a9f99ab44b473fb394169ba365f8b4380f981584.tar.gz talos-obmc-uboot-a9f99ab44b473fb394169ba365f8b4380f981584.zip | |
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>
Diffstat (limited to 'lib_generic')
| -rw-r--r-- | lib_generic/zlib.c | 2 |
1 files changed, 2 insertions, 0 deletions
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> |
