diff options
| author | Lars Persson | 2008-01-03 08:39:49 +0000 |
|---|---|---|
| committer | Lars Persson | 2008-01-03 08:39:49 +0000 |
| commit | 967e56996a429dcbde6e70bec842c3f87df258fd (patch) | |
| tree | ebff1a09302fb5cd766ba2e16d367f98af34d987 | |
| parent | ca6056ae21016050cd3b8fef2a75c07a33a66491 (diff) | |
| download | scummvm-rg350-967e56996a429dcbde6e70bec842c3f87df258fd.tar.gz scummvm-rg350-967e56996a429dcbde6e70bec842c3f87df258fd.tar.bz2 scummvm-rg350-967e56996a429dcbde6e70bec842c3f87df258fd.zip | |
Different zlib.h included paths for Symbian OS to differenciate between system and user includes
svn-id: r30189
| -rw-r--r-- | common/unzip.cpp | 5 | ||||
| -rw-r--r-- | common/unzip.h | 4 | ||||
| -rw-r--r-- | common/zlib.cpp | 5 | ||||
| -rw-r--r-- | common/zlib.h | 4 |
4 files changed, 18 insertions, 0 deletions
diff --git a/common/unzip.cpp b/common/unzip.cpp index a35bf4de23..93fb60f41c 100644 --- a/common/unzip.cpp +++ b/common/unzip.cpp @@ -35,7 +35,12 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + +#ifdef __SYMBIAN32__ +#include <zlib\zlib.h> +#else #include <zlib.h> +#endif #include "common/unzip.h" #include "common/file.h" diff --git a/common/unzip.h b/common/unzip.h index af9f738880..2d888fe5b1 100644 --- a/common/unzip.h +++ b/common/unzip.h @@ -73,7 +73,11 @@ extern "C" { #endif +#ifdef __SYMBIAN32__ +#include <zlib\zlib.h> +#else #include <zlib.h> +#endif #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) /* like the STRICT of WIN32, we define a pointer that cannot be converted diff --git a/common/zlib.cpp b/common/zlib.cpp index 18e7178a52..7e14a9e3ab 100644 --- a/common/zlib.cpp +++ b/common/zlib.cpp @@ -25,7 +25,12 @@ #include "common/zlib.h" #if defined(USE_ZLIB) + +#ifdef __SYMBIAN32__ +#include <zlib\zlib.h> +#else #include <zlib.h> +#endif namespace Common { diff --git a/common/zlib.h b/common/zlib.h index 82be5622ca..62e9f98c01 100644 --- a/common/zlib.h +++ b/common/zlib.h @@ -29,7 +29,11 @@ #ifndef COMMON_ZLIB_H #define COMMON_ZLIB_H +#ifdef __SYMBIAN32__ +#include <zlib\zlib.h> +#else #include <zlib.h> +#endif namespace Common { |