sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network/Win32: Second patch for MinGW #157 

Extending Mstcpip.h fix using C++17 feature __has_include
This commit is contained in:
Jérôme Leclercq 2018-01-26 16:11:53 +01:00
parent b93320613e
commit 3f7bac186b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Network/Win32/IpAddressImpl.cpp
View File

@ -10,8 +10,12 @@
#include <Nazara/Network/Debug.hpp> #include <Nazara/Network/Debug.hpp>
// some MinGW distributions seem to lack some defines // some MinGW distributions seem to lack some defines
#ifndef ERROR_NOT_ENOUGH_MEMORY
#define ERROR_NOT_ENOUGH_MEMORY 8L
#endif
#ifndef WSA_NOT_ENOUGH_MEMORY #ifndef WSA_NOT_ENOUGH_MEMORY
#define WSA_NOT_ENOUGH_MEMORY 8L #define WSA_NOT_ENOUGH_MEMORY (ERROR_NOT_ENOUGH_MEMORY)
#endif #endif
namespace Nz namespace Nz

2
src/Nazara/Network/Win32/SocketImpl.cpp
View File

@ -8,8 +8,8 @@
#include <Nazara/Core/MemoryHelper.hpp> #include <Nazara/Core/MemoryHelper.hpp>
#include <Nazara/Network/Win32/IpAddressImpl.hpp> #include <Nazara/Network/Win32/IpAddressImpl.hpp>
#if defined(NAZARA_COMPILER_MINGW) && __GNUC__ < 5
// Some compilers (olders versions of MinGW) are lacking Mstcpip.h which defines the following struct/#define // Some compilers (olders versions of MinGW) are lacking Mstcpip.h which defines the following struct/#define
#if (defined(__has_include) && !__has_include(<Mstcpip.h>)) || (defined(NAZARA_COMPILER_MINGW) && !defined(__has_include))
struct tcp_keepalive struct tcp_keepalive
{ {
u_long onoff; u_long onoff;