mirror / pcsxr

https://pcsxr.svn.codeplex.com/svn/pcsxr
GNU General Public License v3.0
77 stars 94 forks source link

conflict with zlib-1.2.11 #6

Open frankrw3 opened 7 years ago

frankrw3 commented 7 years ago

The new zlib-1.2.11 has a new function that is called uncompress2 that conflicts with the one in cdriso.c line 916 and line 995.

cdriso.c:916:static int uncompress2(void out, unsigned long out_size, void *in, unsigned long in_size) cdriso.c:995: ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);

to resolve this conflict I renamed the uncompress2 in the cdriso.c file.