From: notaz Date: Thu, 3 Aug 2017 21:36:13 +0000 (+0300) Subject: fix a name clash with newer zlib X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=925254c3fe875acc5d36cb9e5ac2a64851f011f6;p=picodrive.git fix a name clash with newer zlib --- diff --git a/pico/cart.c b/pico/cart.c index d237fad9..25a847d4 100644 --- a/pico/cart.c +++ b/pico/cart.c @@ -50,7 +50,7 @@ typedef struct _cso_struct } cso_struct; -static int uncompress2(void *dest, int destLen, void *source, int sourceLen) +static int uncompress_buf(void *dest, int destLen, void *source, int sourceLen) { z_stream stream; int err; @@ -298,7 +298,7 @@ size_t pm_read(void *ptr, size_t bytes, pm_file *stream) } cso->block_in_buff = block; } - rret = uncompress2(tmp_dst, 2048, cso->in_buff, read_len); + rret = uncompress_buf(tmp_dst, 2048, cso->in_buff, read_len); if (rret != 0) { elprintf(EL_STATUS, "cso: uncompress failed @ %08x with %i", read_pos, rret); break;