From c0bd496c909629067edb44893e4a819bd705aeed Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 2 May 2011 17:19:35 +0200
Subject: COMMON: Fix compilation when zlib support is enabled.

---
 common/unzip.cpp | 2 ++
 common/zlib.cpp  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/common/unzip.cpp b/common/unzip.cpp
index a55dfd1cad..d56893f3cd 100644
--- a/common/unzip.cpp
+++ b/common/unzip.cpp
@@ -68,6 +68,8 @@
    PkWare has also a specification at :
       ftp://ftp.pkware.com/probdesc.zip */
 
+// Disable symbol overrides so that we can use zlib.h
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
 
 #include "common/scummsys.h"
 
diff --git a/common/zlib.cpp b/common/zlib.cpp
index 98ecc10c1d..96e9f8cb15 100644
--- a/common/zlib.cpp
+++ b/common/zlib.cpp
@@ -23,6 +23,9 @@
  *
  */
 
+// Disable symbol overrides so that we can use zlib.h
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
 #include "common/zlib.h"
 #include "common/util.h"
 #include "common/stream.h"
-- 
cgit v1.2.3