projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
zlib.c: avoid build conflicts for cradle board
[platform/kernel/u-boot.git]
/
lib_generic
/
zlib.c
diff --git
a/lib_generic/zlib.c
b/lib_generic/zlib.c
index
8fe3bd0
..
ef1fa22
100644
(file)
--- 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>