From 40854aa5f3abe352bdcb505b91b38c48a021f8c8 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 18 Jun 2014 13:03:11 +0200
Subject: [PATCH] Fix NeLNS compile under MinGW

---
 code/nelns/login_service/connection_client.cpp | 4 ++--
 code/nelns/login_service/connection_web.cpp    | 2 +-
 code/nelns/login_service/login_service.h       | 4 +++-
 code/nelns/login_service/mysql_helper.h        | 4 +++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/code/nelns/login_service/connection_client.cpp b/code/nelns/login_service/connection_client.cpp
index 37976cb24..8ff713ec2 100644
--- a/code/nelns/login_service/connection_client.cpp
+++ b/code/nelns/login_service/connection_client.cpp
@@ -395,11 +395,11 @@ static void cbWSShardChooseShard (CMessage &msgin, const std::string &serviceNam
 		string addr;
 		msgin.serial (addr);
 		msgout.serial (addr);
-		ClientsServer->send (msgout, (TSockId)cookie.getUserAddr ());
+		ClientsServer->send (msgout, (TSockId)cookie.getUserAddr ()); // FIXME: 64-bit
 		return;
 	}
 	msgout.serial(reason);
-	ClientsServer->send (msgout, (TSockId)cookie.getUserAddr ());
+	ClientsServer->send (msgout, (TSockId)cookie.getUserAddr ()); // FIXME: 64-bit
 }
 
 static const TUnifiedCallbackItem WSCallbackArray[] =
diff --git a/code/nelns/login_service/connection_web.cpp b/code/nelns/login_service/connection_web.cpp
index 290884f91..e3abb9936 100644
--- a/code/nelns/login_service/connection_web.cpp
+++ b/code/nelns/login_service/connection_web.cpp
@@ -117,7 +117,7 @@ static void cbWSShardChooseShard/* (CMessage &msgin, TSockId from, CCallbackNetB
 		*/
 	}
 
-	WebServer->send (msgout, (TSockId)cookie.getUserAddr ());
+	WebServer->send (msgout, (TSockId)cookie.getUserAddr ());  // FIXME: 64-bit
 }
 
 static const TUnifiedCallbackItem WSCallbackArray[] =
diff --git a/code/nelns/login_service/login_service.h b/code/nelns/login_service/login_service.h
index 7c8c5a427..3d84b1c8e 100644
--- a/code/nelns/login_service/login_service.h
+++ b/code/nelns/login_service/login_service.h
@@ -19,7 +19,9 @@
 
 // we have to include windows.h because mysql.h uses it but not include it
 #ifdef NL_OS_WINDOWS
-#	define NOMINMAX
+#	ifndef NL_COMP_MINGW
+#		define NOMINMAX
+#	endif
 #	include <winsock2.h>
 #	include <windows.h>
 typedef unsigned long ulong;
diff --git a/code/nelns/login_service/mysql_helper.h b/code/nelns/login_service/mysql_helper.h
index fee1d1bf6..ed4ebbd48 100644
--- a/code/nelns/login_service/mysql_helper.h
+++ b/code/nelns/login_service/mysql_helper.h
@@ -24,7 +24,9 @@
 
 // we have to include windows.h because mysql.h uses it but not include it
 #ifdef NL_OS_WINDOWS
-#	define NOMINMAX
+#	ifndef NL_COMP_MINGW
+#		define NOMINMAX
+#	endif
 #	include <winsock2.h>
 #	include <windows.h>
 typedef unsigned long ulong;