From dd8eacee1b28ca40f8dc770587d111656d92d5fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 14 Sep 2015 02:36:03 +0200
Subject: GH-1227 renam GZip functions to not collide with zlib macros

---
 logic/minecraft/World.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'logic/minecraft')

diff --git a/logic/minecraft/World.cpp b/logic/minecraft/World.cpp
index bb99aa96..cda81309 100644
--- a/logic/minecraft/World.cpp
+++ b/logic/minecraft/World.cpp
@@ -187,7 +187,7 @@ static int64_t read_long (nbt::value& parent, const char * name, const int64_t &
 void World::parseLevelDat(QByteArray data)
 {
 	QByteArray output;
-	is_valid = GZip::decompress(data, output);
+	is_valid = GZip::unzip(data, output);
 	if(!is_valid)
 	{
 		return;
-- 
cgit v1.2.3