From: Twinaphex <libretro@gmail.com>
Date: Tue, 24 Jan 2017 23:20:37 +0000 (+0100)
Subject: Merge pull request #96 from orbea/zlib
X-Git-Tag: r24l~807
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b816fab00204011a58f0b88f35602866ca4268f7;p=pcsx_rearmed.git

Merge pull request #96 from orbea/zlib

Rename uncompress2 to avoid conflicts with zlib.h on some systems
---

b816fab00204011a58f0b88f35602866ca4268f7