arm: mx6: rename some missed instances of CONFIG_MX6* to CONFIG_SOC_MX6*

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

diff --git a/lib/zlib/zutil.c b/lib/zlib/zutil.c
index 65f9554747b3f4936af75949da5fbe4e62ef0eb0..173a81d1ea4df76325f2f45cbe82aa8e3e10641c 100644 (file)
--- a/lib/zlib/zutil.c
+++ b/lib/zlib/zutil.c
@@ -43,16 +43,15 @@ 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 (opaque, items, size)
-       voidpf opaque;
-       unsigned items;
-       unsigned size;
+voidpf zcalloc(voidpf opaque, unsigned items, unsigned size)
 {
        if (opaque)
                items += size - size; /* make compiler happy */
@@ -60,10 +59,7 @@ voidpf zcalloc (opaque, items, size)
                (voidpf)calloc(items, size);
 }
 
-void  zcfree (opaque, ptr, nb)
-       voidpf opaque;
-       voidpf ptr;
-       unsigned nb;
+void  zcfree(voidpf opaque, voidpf ptr, unsigned nb)
 {
        free(ptr);
        if (opaque)