From 7dc6b6adbdd127b72d605eb1b8b75a34da59bddf Mon Sep 17 00:00:00 2001
From: Lars Persson
Date: Fri, 30 Sep 2005 21:13:49 +0000
Subject: 1.Removed warning from symbian portdefs 2.Made thumbnail.cpp compile
 for VC6 (Symbian Emulator environment). Order of template declaration and
 includes causing the problems 3.Moved int i declaration from for;loop into
 local variable 4.Updated stdafx uio.h is not part of the Symbian build chain.

svn-id: r18909
---
 backends/epoc/portdefs.h    | 2 +-
 common/scaler/thumbnail.cpp | 3 ++-
 common/stdafx.h             | 2 +-
 saga/rscfile.cpp            | 5 +++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/backends/epoc/portdefs.h b/backends/epoc/portdefs.h
index 6a475019bf..2349adf865 100644
--- a/backends/epoc/portdefs.h
+++ b/backends/epoc/portdefs.h
@@ -48,7 +48,7 @@
 #else // WINS
 
 	// let's just blatantly ignore this for now and just get it to work :P but does n't work from the debug function
-	int inline scumm_snprintf (char *str, unsigned long n, char const *fmt, ...)
+	int inline scumm_snprintf (char *str, unsigned long /*n*/, char const *fmt, ...)
 	{
 		va_list args;
 		va_start(args, fmt);
diff --git a/common/scaler/thumbnail.cpp b/common/scaler/thumbnail.cpp
index 8ada19a670..49d2eb9154 100644
--- a/common/scaler/thumbnail.cpp
+++ b/common/scaler/thumbnail.cpp
@@ -24,7 +24,6 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 
-#include "common/scaler.h"
 #include "common/scaler/intern.h"
 
 template<int bitFormat>
@@ -69,6 +68,8 @@ void createThumbnail_4(const uint8* src, uint32 srcPitch, uint8* dstPtr, uint32
 	}
 }
 
+#include "common/scaler.h"
+
 void createThumbnail(const uint8* src, uint32 srcPitch, uint8* dstPtr, uint32 dstPitch, int width, int height) {
 	// only 1/2 and 1/4 downscale supported
 	if (width != 320 && width != 640)
diff --git a/common/stdafx.h b/common/stdafx.h
index ea386476dc..2e2defd655 100644
--- a/common/stdafx.h
+++ b/common/stdafx.h
@@ -115,7 +115,7 @@
 #endif
 #if !defined(macintosh) && !defined(PALMOS_ARM)
 #include <sys/types.h>
-#if !defined(__PLAYSTATION2__) && !defined(__PSP__) && !defined(__amigaos4__)
+#if !defined(__PLAYSTATION2__) && !defined(__PSP__) && !defined(__amigaos4__) && !defined(__SYMBIAN32__,)
 #include <sys/uio.h>
 #endif
 #if !defined(__amigaos4__)
diff --git a/saga/rscfile.cpp b/saga/rscfile.cpp
index 381beb823e..cb792c1af8 100644
--- a/saga/rscfile.cpp
+++ b/saga/rscfile.cpp
@@ -441,6 +441,7 @@ void Resource::loadGlobalResources(int chapter, int actorsEntrance) {
 
 	ResourceContext *resourceContext;
 	ResourceContext *soundContext;
+    int i;
 
 	resourceContext = _vm->_resource->getContext(GAME_RESOURCEFILE);
 	if (resourceContext == NULL) {
@@ -510,7 +511,7 @@ void Resource::loadGlobalResources(int chapter, int actorsEntrance) {
 
 	MemoryReadStream fxS(resourcePointer, resourceLength);
 
-	for (int i = 0; i < _vm->_sndRes->_fxTableLen; i++) {
+	for (i = 0; i < _vm->_sndRes->_fxTableLen; i++) {
 		_vm->_sndRes->_fxTable[i].res = fxS.readSint16LE();
 		_vm->_sndRes->_fxTable[i].vol = fxS.readSint16LE();
 	}
@@ -549,7 +550,7 @@ void Resource::loadGlobalResources(int chapter, int actorsEntrance) {
 
 	MemoryReadStream songS(resourcePointer, resourceLength);
 
-	for (int i = 0; i < _vm->_music->_songTableLen; i++)
+	for (i = 0; i < _vm->_music->_songTableLen; i++)
 		_vm->_music->_songTable[i] = songS.readSint32LE();
 	free(resourcePointer);
 
-- 
cgit v1.2.3