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
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
lib_generic
/
zlib.c
diff --git
a/lib_generic/zlib.c
b/lib_generic/zlib.c
index
5721968
..
26e5af1
100644
(file)
--- a/
lib_generic/zlib.c
+++ b/
lib_generic/zlib.c
@@
-30,6
+30,8
@@
#include <compiler.h>
#include <asm/unaligned.h>
#include "u-boot/zlib.h"
+#undef OFF /* avoid conflicts */
+
/* To avoid a build time warning */
#ifdef STDC
#include <malloc.h>