aboutsummaryrefslogtreecommitdiff
path: root/libpcsxcore
diff options
context:
space:
mode:
authorgameblabla2019-03-07 21:05:25 +0100
committergameblabla2019-03-07 21:05:25 +0100
commit2dd6a826efdfffd4e3f4659d392c8b1c386b2915 (patch)
treeda59aaab674ddb627c7530cbe9904c7d938f9f5c /libpcsxcore
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 'libpcsxcore')
-rw-r--r--libpcsxcore/cdriso.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index 515370f..dca64fa 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -1089,7 +1089,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector)
return ret;
}
-static 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;
@@ -1169,7 +1169,7 @@ static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector)
if (is_compressed) {
cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift;
cdbuffer_size = cdbuffer_size_expect;
- ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
+ ret = uncompress2_pcsx(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
if (ret != 0) {
SysPrintf("uncompress failed with %d for block %d, sector %d\n",
ret, block, sector);