[Scummvm-cvs-logs] SF.net SVN: scummvm: [30188] scummvm/branches/branch-0-11-0/common

[Anotherguest at users.sourceforge.net]

Revision: 30188
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30188&view=rev
Author:   Anotherguest
Date:     2008-01-03 00:36:16 -0800 (Thu, 03 Jan 2008)

Log Message:
-----------
Different zlib.h included paths for Symbian OS to differenciate between system and user includes

Modified Paths:
--------------
    scummvm/branches/branch-0-11-0/common/unzip.cpp
    scummvm/branches/branch-0-11-0/common/unzip.h
    scummvm/branches/branch-0-11-0/common/zlib.cpp
    scummvm/branches/branch-0-11-0/common/zlib.h

Modified: scummvm/branches/branch-0-11-0/common/unzip.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/common/unzip.cpp	2008-01-03 07:56:02 UTC (rev 30187)
+++ scummvm/branches/branch-0-11-0/common/unzip.cpp	2008-01-03 08:36:16 UTC (rev 30188)
@@ -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"

Modified: scummvm/branches/branch-0-11-0/common/unzip.h
===================================================================
--- scummvm/branches/branch-0-11-0/common/unzip.h	2008-01-03 07:56:02 UTC (rev 30187)
+++ scummvm/branches/branch-0-11-0/common/unzip.h	2008-01-03 08:36:16 UTC (rev 30188)
@@ -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

Modified: scummvm/branches/branch-0-11-0/common/zlib.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/common/zlib.cpp	2008-01-03 07:56:02 UTC (rev 30187)
+++ scummvm/branches/branch-0-11-0/common/zlib.cpp	2008-01-03 08:36:16 UTC (rev 30188)
@@ -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 {
 

Modified: scummvm/branches/branch-0-11-0/common/zlib.h
===================================================================
--- scummvm/branches/branch-0-11-0/common/zlib.h	2008-01-03 07:56:02 UTC (rev 30187)
+++ scummvm/branches/branch-0-11-0/common/zlib.h	2008-01-03 08:36:16 UTC (rev 30188)
@@ -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 {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.