From: notaz <notasas@gmail.com>
Date: Thu, 3 Aug 2017 21:36:13 +0000 (+0300)
Subject: fix a name clash with newer zlib
X-Git-Tag: v1.92~62
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad949800e42b25e498d58ff73e656df4c0bc2c6d;p=picodrive.git

fix a name clash with newer zlib
---

diff --git a/pico/cart.c b/pico/cart.c
index d091d623..1ce80597 100644
--- a/pico/cart.c
+++ b/pico/cart.c
@@ -49,7 +49,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;
@@ -326,7 +326,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;