- compiler fixes for windows

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;

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] == '}' ||

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{
 
 // =====================================

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{