GH-1227 fix zlib nonsense on Windows

2015-09-10 00:02:02 +02:00
parent a1fd50e920
commit db5816b0a2
4 changed files with 4 additions and 8 deletions
--- a/logic/GZip.cpp
+++ b/logic/GZip.cpp
@@ -8,11 +8,7 @@ int wrap_inflate (z_streamp strm, int flush)
 	return inflate(strm, flush);
 }

-#ifdef inflate
-	#undef inflate
-#endif
-
-bool GZip::inflate(const QByteArray &compressedBytes, QByteArray &uncompressedBytes)
+bool GZip::decompress(const QByteArray &compressedBytes, QByteArray &uncompressedBytes)
 {
 	if (compressedBytes.size() == 0)
 	{