[Scummvm-cvs-logs] scummvm master -> b2693c81ecfce7c60c5fa3be228a057173efc609

[lordhoto]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c0bd496c90 COMMON: Fix compilation when zlib support is enabled.
b2693c81ec SWORD25: Fix compilation, caused by zlib.h including unistd.h


Commit: c0bd496c909629067edb44893e4a819bd705aeed
    https://github.com/scummvm/scummvm/commit/c0bd496c909629067edb44893e4a819bd705aeed
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-05-02T08:19:35-07:00

Commit Message:
COMMON: Fix compilation when zlib support is enabled.

Changed paths:
    common/unzip.cpp
    common/zlib.cpp



diff --git a/common/unzip.cpp b/common/unzip.cpp
index a55dfd1..d56893f 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 98ecc10..96e9f8c 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"


Commit: b2693c81ecfce7c60c5fa3be228a057173efc609
    https://github.com/scummvm/scummvm/commit/b2693c81ecfce7c60c5fa3be228a057173efc609
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-05-02T08:19:54-07:00

Commit Message:
SWORD25: Fix compilation, caused by zlib.h including unistd.h

Changed paths:
    engines/sword25/kernel/persistenceservice.cpp



diff --git a/engines/sword25/kernel/persistenceservice.cpp b/engines/sword25/kernel/persistenceservice.cpp
index be66b6a..506eef3 100644
--- a/engines/sword25/kernel/persistenceservice.cpp
+++ b/engines/sword25/kernel/persistenceservice.cpp
@@ -32,6 +32,9 @@
  *
  */
 
+// Disable symbol overrides so that we can use zlib.h
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
 #include "common/fs.h"
 #include "common/savefile.h"
 #include "sword25/kernel/kernel.h"