From db5816b0a20aac63fb97188ea2034903db254bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 10 Sep 2015 00:02:02 +0200
Subject: GH-1227 fix zlib nonsense on Windows

---
 logic/GZip.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'logic/GZip.cpp')

diff --git a/logic/GZip.cpp b/logic/GZip.cpp
index 96d58ea8..5207f3f0 100644
--- 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)
 	{
-- 
cgit v1.2.3