x86: Forward declare gd_t

[karo-tx-uboot.git] / lib / gunzip.c

diff --git a/lib/gunzip.c b/lib/gunzip.c
index 8b16b2495fbec50956ff027c5e49803435034592..99a8ab028760bbd2d5ae44e5e4eed03b2f99106a 100644 (file)
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -36,10 +36,7 @@
 #define RESERVED               0xe0
 #define DEFLATED               8
 
-void *zalloc(void *, unsigned, unsigned);
-void zfree(void *, void *, unsigned);
-
-void *zalloc(void *x, unsigned items, unsigned size)
+void *gzalloc(void *x, unsigned items, unsigned size)
 {
        void *p;
 
@@ -51,7 +48,7 @@ void *zalloc(void *x, unsigned items, unsigned size)
        return (p);
 }
 
-void zfree(void *x, void *addr, unsigned nb)
+void gzfree(void *x, void *addr, unsigned nb)
 {
        free (addr);
 }
@@ -94,8 +91,8 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
        z_stream s;
        int r;
 
-       s.zalloc = zalloc;
-       s.zfree = zfree;
+       s.zalloc = gzalloc;
+       s.zfree = gzfree;
 
        r = inflateInit2(&s, -MAX_WBITS);
        if (r != Z_OK) {