diff options
| author | Johannes Schickel | 2011-05-02 17:19:35 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-05-02 17:19:35 +0200 |
| commit | c0bd496c909629067edb44893e4a819bd705aeed (patch) | |
| tree | 628e4b90854019d2e383cd46a768fc9fd489db0e | |
| parent | 59e77ed66779d33a14a5f4d2a5885a70b793f36f (diff) | |
| download | scummvm-rg350-c0bd496c909629067edb44893e4a819bd705aeed.tar.gz scummvm-rg350-c0bd496c909629067edb44893e4a819bd705aeed.tar.bz2 scummvm-rg350-c0bd496c909629067edb44893e4a819bd705aeed.zip | |
COMMON: Fix compilation when zlib support is enabled.
| -rw-r--r-- | common/unzip.cpp | 2 | ||||
| -rw-r--r-- | common/zlib.cpp | 3 |
2 files changed, 5 insertions, 0 deletions
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" |