minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

zlib.c: avoid build conflicts for cradle board

Browse Source 
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>
This commit is contained in:
Wolfgang Denk 2009-12-06 00:53:18 +01:00
parent 8cbf4e4f17
commit a9f99ab44b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib_generic/zlib.c
View File

@ -28,6 +28,8 @@
#include "u-boot/zlib.h" #include "u-boot/zlib.h"
#include <common.h> #include <common.h>
#undef OFF /* avoid conflicts */
/* To avoid a build time warning */ /* To avoid a build time warning */
#ifdef STDC #ifdef STDC
#include <malloc.h> #include <malloc.h>