From c8a8e0fb18c7c7cb6cf445dc9595eaf69f3cd126 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Mon, 6 Jan 2014 14:04:32 +0100
Subject: zlib: rename z_errmsg symbol to avoid name clash when linking
 statically

Task-number: QTBUG-35301
Change-Id: I298fba7270ee49d4e2dfc624b18aa13ce25864be
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: aavit <eirik.aavitsland@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 src/3rdparty/zlib/zconf.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/3rdparty/zlib')

diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h
index dc52489bc2..d01f20bc07 100644
--- a/src/3rdparty/zlib/zconf.h
+++ b/src/3rdparty/zlib/zconf.h
@@ -107,6 +107,7 @@
 #  define zcfree                z_zcfree
 #  define zlibCompileFlags      z_zlibCompileFlags
 #  define zlibVersion           z_zlibVersion
+#  define z_errmsg              z_z_errmsg
 
 /* all zlib typedefs in zlib.h and zconf.h */
 #  define Byte                  z_Byte
-- 
cgit v1.2.3