From 64d1e696b066d3ba25c9f8902270a16fb4b8d76f Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Sun, 25 Sep 2011 23:27:26 +0000
Subject: [PATCH] - compiler fixes for windows

---
 .../shared_lib/include/platform/common/platform_common.h   | 6 ++++--
 source/shared_lib/sources/platform/posix/ircclient.cpp     | 2 +-
 source/shared_lib/sources/platform/sdl/thread.cpp          | 7 +------
 source/shared_lib/sources/util/conversion.cpp              | 6 +-----
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/source/shared_lib/include/platform/common/platform_common.h b/source/shared_lib/include/platform/common/platform_common.h
index f9a96d58..704308a6 100644
--- a/source/shared_lib/include/platform/common/platform_common.h
+++ b/source/shared_lib/include/platform/common/platform_common.h
@@ -12,9 +12,7 @@
 #define _SHARED_PLATFORM_PLATFORMCOMMON_H_
 
 #ifdef WIN32
-
 #include <windows.h>
-
 #endif
 
 #include <string>
@@ -29,6 +27,10 @@
 #include <map>
 #include "leak_dumper.h"
 
+#if (defined WIN32) && !(defined snprintf)
+#define snprintf _snprintf
+#endif
+
 using std::string;
 using std::vector;
 using std::list;
diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp
index 1971e478..a9b369c6 100644
--- a/source/shared_lib/sources/platform/posix/ircclient.cpp
+++ b/source/shared_lib/sources/platform/posix/ircclient.cpp
@@ -579,7 +579,7 @@ void normalizeNick(char *nick) {
 		memset(newNick,0,strlen(nick)+1);
 		bool nickChanged = false;
 
-		for(int i = 0; i < strlen(nick); ++i) {
+		for(unsigned int i = 0; i < strlen(nick); ++i) {
 			if(nick[i] == '-' || nick[i] == '[' || nick[i] == ']' || nick[i] == '_' ||
 			   nick[i] == '\\' || nick[i] == '`' || nick[i] == '^' ||
 			   nick[i] == '{' || nick[i] == '}' ||
diff --git a/source/shared_lib/sources/platform/sdl/thread.cpp b/source/shared_lib/sources/platform/sdl/thread.cpp
index 991689e5..5a3fa499 100644
--- a/source/shared_lib/sources/platform/sdl/thread.cpp
+++ b/source/shared_lib/sources/platform/sdl/thread.cpp
@@ -14,15 +14,10 @@
 #include <assert.h>
 
 #include "noimpl.h"
+#include "platform_common.h"
 
 using namespace std;
 
-#ifdef WIN32
-
-#define snprintf _snprintf
-
-#endif
-
 namespace Shared{ namespace Platform{
 
 // =====================================
diff --git a/source/shared_lib/sources/util/conversion.cpp b/source/shared_lib/sources/util/conversion.cpp
index c89d3e85..11a33392 100644
--- a/source/shared_lib/sources/util/conversion.cpp
+++ b/source/shared_lib/sources/util/conversion.cpp
@@ -14,13 +14,9 @@
 #include <stdexcept>
 #include <cstdio>
 #include <cstdlib>
-
+#include "platform_common.h"
 #include "leak_dumper.h"
 
-#ifdef WIN32
-#define snprintf _snprintf
-#endif
-
 using namespace std;
 
 namespace Shared{ namespace Util{