mtd/nand/ubi: assortment of alignment fixes

[karo-tx-uboot.git] / lib / zlib / zutil.c

diff --git a/lib/zlib/zutil.c b/lib/zlib/zutil.c
index 14f6eb1e07d9d65a20231119d693231d1ed49c1a..173a81d1ea4df76325f2f45cbe82aa8e3e10641c 100644 (file)
--- a/lib/zlib/zutil.c
+++ b/lib/zlib/zutil.c
@@ -43,11 +43,13 @@ void z_error (m)
  */
 #ifndef MY_ZCALLOC /* Any system without a special alloc function */
 
+#ifndef __UBOOT__
 #ifndef STDC
 extern voidp    malloc OF((uInt size));
 extern voidp    calloc OF((uInt items, uInt size));
 extern void     free   OF((voidpf ptr));
 #endif
+#endif
 
 voidpf zcalloc(voidpf opaque, unsigned items, unsigned size)
 {