diff options
| author | Littleboy | 2011-05-02 17:18:22 -0400 |
|---|---|---|
| committer | Littleboy | 2011-05-02 17:21:10 -0400 |
| commit | 0e45aa8655dc3122e8d88dbcb67ab2013a292989 (patch) | |
| tree | f523e5c1870497528d85385ce5ef24259937813c /common/unzip.cpp | |
| parent | 580986aa42889c9a775b3ebe5709292d779f41cf (diff) | |
| parent | 1aff380a15f12e53bd380fc2a189882e2d6172c0 (diff) | |
| download | scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.tar.gz scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.tar.bz2 scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.zip | |
Merge remote-tracking branch 'upstream/master' into nsis
Conflicts:
devtools/create_project/scripts/postbuild.cmd
devtools/create_project/visualstudio.cpp
ports.mk
Diffstat (limited to 'common/unzip.cpp')
| -rw-r--r-- | common/unzip.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/unzip.cpp b/common/unzip.cpp index 7b78da0faf..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" @@ -105,7 +107,6 @@ typedef struct { #include "common/fs.h" #include "common/unzip.h" -#include "common/file.h" #include "common/memstream.h" #include "common/hashmap.h" |