From 222d754da510270304919390039981bc04fa6c11 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Thu, 25 Feb 2010 16:46:54 +0000
Subject: [PATCH] - parameter swirly - warning level 4 is better

---
 src/basic/basic.vcproj             |  2 +-
 src/common/build/external.c        |  4 ++++
 src/common/tests.c                 |  1 +
 src/common/tests.vcproj            | 10 +++++++++-
 src/eressea/eressea.vcproj         |  2 +-
 src/eressea/src/spells/unitcurse.c |  4 ++--
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/basic/basic.vcproj b/src/basic/basic.vcproj
index 657f38009..3e32ed951 100644
--- a/src/basic/basic.vcproj
+++ b/src/basic/basic.vcproj
@@ -52,7 +52,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				WarningLevel="3"
+				WarningLevel="4"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 			/>
diff --git a/src/common/build/external.c b/src/common/build/external.c
index 25fb2428d..720a37494 100644
--- a/src/common/build/external.c
+++ b/src/common/build/external.c
@@ -2,7 +2,11 @@
 #include <platform.h>
 #include "stdafx.h"
 
+#pragma warning(push)
+#pragma warning(disable: 4244)
+#pragma warning(disable: 4127)
 #include <external/sqlite3.c>
+#pragma warning(pop)
 #include <external/md5.c>
 #include <external/bson/bson.c>
 #include <external/bson/numbers.c>
diff --git a/src/common/tests.c b/src/common/tests.c
index 7443dd285..216b24be7 100644
--- a/src/common/tests.c
+++ b/src/common/tests.c
@@ -19,4 +19,5 @@ void RunAllTests(void) {
 
 int main(int argc, char **argv) {
   RunAllTests();
+  return 0;
 }
diff --git a/src/common/tests.vcproj b/src/common/tests.vcproj
index 972cd44aa..f550bfded 100644
--- a/src/common/tests.vcproj
+++ b/src/common/tests.vcproj
@@ -52,7 +52,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
-				WarningLevel="3"
+				WarningLevel="4"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 			/>
@@ -197,6 +197,14 @@
 			<File
 				RelativePath="..\external\cutest\CuTest.c"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\tests.c"
diff --git a/src/eressea/eressea.vcproj b/src/eressea/eressea.vcproj
index 35778fe8c..f4225ee24 100644
--- a/src/eressea/eressea.vcproj
+++ b/src/eressea/eressea.vcproj
@@ -52,7 +52,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				WarningLevel="3"
+				WarningLevel="4"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 			/>
diff --git a/src/eressea/src/spells/unitcurse.c b/src/eressea/src/spells/unitcurse.c
index 33b623210..b3b5fc4fc 100644
--- a/src/eressea/src/spells/unitcurse.c
+++ b/src/eressea/src/spells/unitcurse.c
@@ -297,7 +297,7 @@ static struct curse_type ct_magicresistance = {
  */
 
 static int
-read_skill(struct storage * store, void * target, curse * c)
+read_skill(struct storage * store, curse * c, void * target)
 {
   int skill;
   if (store->version<CURSETYPE_VERSION) {
@@ -312,7 +312,7 @@ read_skill(struct storage * store, void * target, curse * c)
 }
 
 static int
-write_skill(struct storage * store, const void * target, const curse * c)
+write_skill(struct storage * store, const curse * c, const void * target)
 {
   store->w_int(store, c->data.i);
   return 0;