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 /plugins/cdrcimg | |
| 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 'plugins/cdrcimg')
| -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 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, |