diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-04-30 18:19:28 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-04-30 18:19:28 +0200 |
| commit | 0a6deb3251a68b5be640ab1b848ca67e906b75ce (patch) | |
| tree | 8bf3b48fdf66cad167186110fb6ab4f79a335a57 /lib | |
| parent | e0f6a4e8b17afead8add6e528936a505367c091c (diff) | |
| parent | 6777a3cf73f621892afe938983918d2aea7730b5 (diff) | |
| download | blackbird-obmc-uboot-0a6deb3251a68b5be640ab1b848ca67e906b75ce.tar.gz blackbird-obmc-uboot-0a6deb3251a68b5be640ab1b848ca67e906b75ce.zip | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
lin_gadget: use common linux/compat.h
linux/compat.h: rename from linux/mtd/compat.h
lin_gadget: use common mdelay
gunzip: rename z{alloc, free} to gz{alloc, free}
fs/fat: align disk buffers on cache line to enable DMA and cache
part_dos: align disk buffers on cache line to enable DMA and cache
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gunzip.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/gunzip.c b/lib/gunzip.c index 8b16b2495f..99a8ab0287 100644 --- 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) { |
