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 /plugins/cdrcimg/cdrcimg.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 'plugins/cdrcimg/cdrcimg.c')
-rw-r--r-- | plugins/cdrcimg/cdrcimg.c | 4 |
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, |