mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
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>
This commit is contained in:
parent
8cbf4e4f17
commit
a9f99ab44b
1 changed files with 2 additions and 0 deletions
|
@ -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>
|
||||
|
|
Loading…
Add table
Reference in a new issue