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

Core/Config: Rename WINDOWS_VISTA option to WINDOWS_NT6

Browse Source 
Former-commit-id: 9d0c33b7d79521e074aa84684d09d7855956d1df [formerly 7400f0dc41845e0bf275e7a631ec760857db6009] [formerly 9bc38d067febb9723119adf811922642b1f7b782 [formerly e7b9f3e327d422a9ed1e01cdc9439170a67bf7d2]]
Former-commit-id: 8614882bef71668ed10cd7fedbf4a058073e6389 [formerly 1bbf4a90092509565475a1709c82dc696f8b8a04]
Former-commit-id: 0b6c22973bfa60dca69902388244d4d40fc9b554
This commit is contained in:
Lynix
2016-09-27 13:40:29 +02:00
parent 7529855fc0
commit c61b4598e8
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ namespace Nz
{
namespace Detail
{
#if NAZARA_CORE_WINDOWS_VISTA
#if NAZARA_CORE_WINDOWS_NT6
using addrinfoImpl = addrinfoW;
int GetAddressInfo(const String& hostname, const String& service, const addrinfoImpl* hints, addrinfoImpl** results)
@@ -105,7 +105,7 @@ namespace Nz
return IpAddress::Invalid;
}
#if NAZARA_CORE_WINDOWS_VISTA
#if NAZARA_CORE_WINDOWS_NT6
IpAddress IpAddressImpl::FromAddrinfo(const addrinfoW* info)
{
switch (info->ai_family)

2
src/Nazara/Network/Win32/IpAddressImpl.hpp
View File

@@ -22,7 +22,7 @@ namespace Nz
~IpAddressImpl() = delete;
static IpAddress FromAddrinfo(const addrinfo* info);
#if NAZARA_CORE_WINDOWS_VISTA
#if NAZARA_CORE_WINDOWS_NT6
static IpAddress FromAddrinfo(const addrinfoW* info);
#endif
static IpAddress FromSockAddr(const sockaddr* address);

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

@@ -12,7 +12,7 @@
#include <Nazara/Network/IpAddress.hpp>
#include <winsock2.h>
#define NAZARA_NETWORK_POLL_SUPPORT NAZARA_CORE_WINDOWS_VISTA
#define NAZARA_NETWORK_POLL_SUPPORT NAZARA_CORE_WINDOWS_NT6
namespace Nz
{