From 9414d7a6e287ff8abfb5746b564e92c8f0e6de58 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Sun, 24 Apr 2011 11:34:27 +0300
Subject: JANITORIAL: Reduce header dependencies in shared code

Some backends may break as I only compiled SDL
---
 common/unzip.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'common/unzip.cpp')

diff --git a/common/unzip.cpp b/common/unzip.cpp
index 7b78da0faf..a55dfd1cad 100644
--- a/common/unzip.cpp
+++ b/common/unzip.cpp
@@ -105,7 +105,6 @@ typedef struct {
 
 #include "common/fs.h"
 #include "common/unzip.h"
-#include "common/file.h"
 #include "common/memstream.h"
 
 #include "common/hashmap.h"
-- 
cgit v1.2.3


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 ++
 1 file changed, 2 insertions(+)

(limited to 'common/unzip.cpp')

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"
 
-- 
cgit v1.2.3