From f74f1800445986117a5077c5d8c53395e1c48e73 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Thu, 9 Jun 2016 13:02:02 +0200
Subject: [PATCH] Fix compilation for CodeBlocks 16.01 ! (Fixes #65)

Former-commit-id: f49f9b662c6e105d1249f7f7839f8a711be87640 [formerly ab9e2158aebc0583790b52d6397015fe470c0a31]
Former-commit-id: d68b86c1319bdfd956b226865831e7c2d0a5ea42
---
 build/scripts/common.lua                |  6 +++++-
 src/Nazara/Network/Win32/SocketImpl.cpp | 23 +++++++++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/build/scripts/common.lua b/build/scripts/common.lua
index 5124dcace..f08828e3b 100644
--- a/build/scripts/common.lua
+++ b/build/scripts/common.lua
@@ -83,7 +83,7 @@ function NazaraBuild:Execute()
 				targetsuffix("-s")
 
 			configuration("codeblocks or codelite or gmake or xcode3 or xcode4")
-				buildoptions({"-fPIC", "-std=c++14"})
+				buildoptions({"-fPIC", "-std=c++14", "-U__STRICT_ANSI__"})
 
 			for k, libTable in ipairs(self.OrderedExtLibs) do
 				project(libTable.Name)
@@ -900,6 +900,10 @@ function NazaraBuild:Resolve(infoTable)
 end
 
 function NazaraBuild:MakeCopyAfterBuild(infoTable)
+    if (PremakeVersion < 50) then
+        return
+    end
+
 	if (os.is("windows")) then
 		configuration({})
 			postbuildcommands({[[xcopy "%{path.translate(cfg.linktarget.relpath):sub(1, -5) .. ".dll"}" "..\..\..\examples\bin\" /E /Y]]})
diff --git a/src/Nazara/Network/Win32/SocketImpl.cpp b/src/Nazara/Network/Win32/SocketImpl.cpp
index 35d4b2371..9e5846471 100644
--- a/src/Nazara/Network/Win32/SocketImpl.cpp
+++ b/src/Nazara/Network/Win32/SocketImpl.cpp
@@ -6,7 +6,22 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Network/Win32/IpAddressImpl.hpp>
-#include <Mstcpip.h>
+
+#include <Winsock2.h>
+#ifdef NAZARA_COMPILER_MINGW
+// MinGW is lacking Mstcpip.h and that's too bad
+struct tcp_keepalive
+{
+    u_long onoff;
+    u_long keepalivetime;
+    u_long keepaliveinterval;
+};
+
+#define SIO_KEEPALIVE_VALS    _WSAIOW(IOC_VENDOR,4)
+#else
+    #include <Mstcpip.h>
+#endif // NAZARA_COMPILER_MINGW
+
 #include <Nazara/Network/Debug.hpp>
 
 namespace Nz
@@ -93,7 +108,7 @@ namespace Nz
 
 		IpAddressImpl::SockAddrBuffer nameBuffer;
 		int bufferLength = IpAddressImpl::ToSockAddr(address, nameBuffer.data());
-		
+
 		if (error)
 			*error = SocketError_NoError;
 
@@ -365,7 +380,7 @@ namespace Nz
 
 			return IpAddress();
 		}
-		
+
 		if (error)
 			*error = SocketError_NoError;
 
@@ -566,7 +581,7 @@ namespace Nz
 
 		return true;
 	}
-	
+
 	bool SocketImpl::SetBroadcasting(SocketHandle handle, bool broadcasting, SocketError* error)
 	{
 		NazaraAssert(handle != InvalidHandle, "Invalid handle");