aboutsummaryrefslogtreecommitdiff
path: root/plugins/cdrcimg
diff options
context:
space:
mode:
authorgameblabla2019-03-07 21:05:25 +0100
committergameblabla2019-03-07 21:05:25 +0100
commit2dd6a826efdfffd4e3f4659d392c8b1c386b2915 (patch)
treeda59aaab674ddb627c7530cbe9904c7d938f9f5c /plugins/cdrcimg
parentbebe989ba22f0bac230a0b8a75617ae895ea274f (diff)
downloadpcsx_rearmed-2dd6a826efdfffd4e3f4659d392c8b1c386b2915.tar.gz
pcsx_rearmed-2dd6a826efdfffd4e3f4659d392c8b1c386b2915.tar.bz2
pcsx_rearmed-2dd6a826efdfffd4e3f4659d392c8b1c386b2915.zip
Fix for compiling it against newer zlib versions.
Diffstat (limited to 'plugins/cdrcimg')
-rw-r--r--plugins/cdrcimg/cdrcimg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c
index 76cdfba..91cf1ca 100644
--- a/plugins/cdrcimg/cdrcimg.c
+++ b/plugins/cdrcimg/cdrcimg.c
@@ -98,7 +98,7 @@ static long CDRgetTD(unsigned char track, unsigned char *buffer)
return 0;
}
-int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+static int uncompress2_pcsx(void *out, unsigned long *out_size, void *in, unsigned long in_size)
{
static z_stream z;
int ret = 0;
@@ -199,7 +199,7 @@ static long CDRreadTrack(unsigned char *time)
ret = uncompress(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
break;
case CDRC_ZLIB2:
- ret = uncompress2(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
+ ret = uncompress2_pcsx(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
break;
case CDRC_BZ:
ret = pBZ2_bzBuffToBuffDecompress((char *)cdbuffer->raw, (unsigned int *)&cdbuffer_size,