diff options
| author | Twinaphex | 2017-01-25 00:20:37 +0100 |
|---|---|---|
| committer | GitHub | 2017-01-25 00:20:37 +0100 |
| commit | b816fab00204011a58f0b88f35602866ca4268f7 (patch) | |
| tree | 77fd04364ba7c58b26895667f0f4b09b941b1736 /libpcsxcore | |
| parent | af3eda9d3c7cf1a0901077dfd296966e27c2c3c8 (diff) | |
| parent | 6e1725abbbe25119c48d9da71b53a6647eeac6cf (diff) | |
| download | pcsx_rearmed-b816fab00204011a58f0b88f35602866ca4268f7.tar.gz pcsx_rearmed-b816fab00204011a58f0b88f35602866ca4268f7.tar.bz2 pcsx_rearmed-b816fab00204011a58f0b88f35602866ca4268f7.zip | |
Merge pull request #96 from orbea/zlib
Rename uncompress2 to avoid conflicts with zlib.h on some systems
Diffstat (limited to 'libpcsxcore')
| -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 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); |