diff options
| author | notaz | 2019-03-09 19:45:49 +0200 |
|---|---|---|
| committer | GitHub | 2019-03-09 19:45:49 +0200 |
| commit | 3de7d67356c1db36689ae53156944426d77f418f (patch) | |
| tree | 6de70c161c1c7bbea37330d40723a28f849f7064 /libpcsxcore/cdriso.c | |
| parent | ecade89d73add8ed396855fc7aef91b2480f801f (diff) | |
| parent | 2dd6a826efdfffd4e3f4659d392c8b1c386b2915 (diff) | |
| download | pcsx_rearmed-3de7d67356c1db36689ae53156944426d77f418f.tar.gz pcsx_rearmed-3de7d67356c1db36689ae53156944426d77f418f.tar.bz2 pcsx_rearmed-3de7d67356c1db36689ae53156944426d77f418f.zip | |
Merge pull request #124 from gameblabla/buildingfixes
Fix for compiling it against newer zlib versions.
Diffstat (limited to 'libpcsxcore/cdriso.c')
| -rw-r--r-- | libpcsxcore/cdriso.c | 4 |
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); |