From 6e1725abbbe25119c48d9da71b53a6647eeac6cf Mon Sep 17 00:00:00 2001
From: orbea
Date: Tue, 24 Jan 2017 12:56:08 -0800
Subject: Rename uncompress2 to avoid conflicts with zlib.h on some systems.
 Fixes https://github.com/libretro/pcsx_rearmed/issues/87

---
 libpcsxcore/cdriso.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libpcsxcore')

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);
-- 
cgit v1.2.3