From: Wolfgang Denk Date: Sun, 6 Dec 2009 01:11:25 +0100 Subject: [U-Boot] [PATCH] zlib.c: avoid build conflicts for cradle board Message-ID: <1260058285-16457-1-git-send-email-wd@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 cc: Giuseppe Condorelli cc: Angelo Castello cc: Alessandro Rubini --- 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 8fe3bd0..ef1fa22 100644 --- a/lib_generic/zlib.c +++ b/lib_generic/zlib.c @@ -28,6 +28,8 @@ #include "u-boot/zlib.h" #include +#undef OFF /* avoid conflicts */ + /* To avoid a build time warning */ #ifdef STDC #include -- 1.6.2.5