Skip to contentSkip to conversation

zlib.c: avoid build conflicts for cradle board

PATCH New Wolfgang Denk 1 participant 1 message Dec 6, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

cc Giuseppe Condorelli <[email protected]>
cc Angelo Castello <[email protected]>
cc Alessandro Rubini <[email protected]>
---
 lib_generic/zlib.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
lib_generic/zlib.c +2 -0
index 8fe3bd0..ef1fa22 100644
@@ -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>
Signature · 1 line
1.6.2.5