Merge branch 'master' into next

[people/ms/u-boot.git] / lib_generic / zlib.c

diff --git a/lib_generic/zlib.c b/lib_generic/zlib.c
index 572196865a5e32b20474f9487f0da59a57deb41f..26e5af1d8e84bfa74fee86b90adb5d4cbed4b40b 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>