diff options
| author | orbea | 2017-01-24 12:56:08 -0800 |
|---|---|---|
| committer | orbea | 2017-01-24 12:56:08 -0800 |
| commit | 6e1725abbbe25119c48d9da71b53a6647eeac6cf (patch) | |
| tree | 7e15df5aeec543d0ecb6e77154d45a046f890d3f | |
| parent | b580cc4f026c8b1facbf794f39fb3a06238dd484 (diff) | |
| download | pcsx_rearmed-6e1725abbbe25119c48d9da71b53a6647eeac6cf.tar.gz pcsx_rearmed-6e1725abbbe25119c48d9da71b53a6647eeac6cf.tar.bz2 pcsx_rearmed-6e1725abbbe25119c48d9da71b53a6647eeac6cf.zip | |
Rename uncompress2 to avoid conflicts with zlib.h on some systems. Fixes https://github.com/libretro/pcsx_rearmed/issues/87
| -rw-r--r-- | libpcsxcore/cdriso.c | 4 | ||||
| -rw-r--r-- | plugins/cdrcimg/cdrcimg.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index d2c904c..7555ad2 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -1093,7 +1093,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 uncomp2(void *out, unsigned long *out_size, void *in, unsigned long in_size) { static z_stream z; int ret = 0; @@ -1173,7 +1173,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 = uncomp2(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); diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c index 47371aa..45016bb 100644 --- a/plugins/cdrcimg/cdrcimg.c +++ b/plugins/cdrcimg/cdrcimg.c @@ -100,7 +100,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) +int uncomp2(void *out, unsigned long *out_size, void *in, unsigned long in_size) { static z_stream z; int ret = 0; @@ -201,7 +201,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 = uncomp2(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size); break; case CDRC_BZ: ret = pBZ2_bzBuffToBuffDecompress((char *)cdbuffer->raw, (unsigned int *)&cdbuffer_size, |