From c61b4598e82c72f3d09972d69d13c829efb62c3f Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 27 Sep 2016 13:40:29 +0200 Subject: [PATCH] Core/Config: Rename WINDOWS_VISTA option to WINDOWS_NT6 Former-commit-id: 9d0c33b7d79521e074aa84684d09d7855956d1df [formerly 7400f0dc41845e0bf275e7a631ec760857db6009] [formerly 9bc38d067febb9723119adf811922642b1f7b782 [formerly e7b9f3e327d422a9ed1e01cdc9439170a67bf7d2]] Former-commit-id: 8614882bef71668ed10cd7fedbf4a058073e6389 [formerly 1bbf4a90092509565475a1709c82dc696f8b8a04] Former-commit-id: 0b6c22973bfa60dca69902388244d4d40fc9b554 --- include/Nazara/Core/Config.hpp | 4 ++-- include/Nazara/Prerequesites.hpp | 4 ++-- src/Nazara/Core/Win32/ConditionVariableImpl.cpp | 10 +++++----- src/Nazara/Core/Win32/ConditionVariableImpl.hpp | 4 ++-- src/Nazara/Network/Win32/IpAddressImpl.cpp | 4 ++-- src/Nazara/Network/Win32/IpAddressImpl.hpp | 2 +- src/Nazara/Network/Win32/SocketImpl.hpp | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/Nazara/Core/Config.hpp b/include/Nazara/Core/Config.hpp index 87848b052..2ad2513ac 100644 --- a/include/Nazara/Core/Config.hpp +++ b/include/Nazara/Core/Config.hpp @@ -72,8 +72,8 @@ // Number of spinlocks to use with the Windows critical sections (0 to disable) #define NAZARA_CORE_WINDOWS_CS_SPINLOCKS 4096 -// Optimize the Windows implementation with technologies of Windows vista (and greater) (Break the compatibility with XP) -#define NAZARA_CORE_WINDOWS_VISTA 0 +// Optimize the Windows implementation with technologies of Windows NT 6.0 (and greater) (Break the compatibility with Windows XP) +#define NAZARA_CORE_WINDOWS_NT6 0 /* diff --git a/include/Nazara/Prerequesites.hpp b/include/Nazara/Prerequesites.hpp index c2c83626a..95af712eb 100644 --- a/include/Nazara/Prerequesites.hpp +++ b/include/Nazara/Prerequesites.hpp @@ -74,7 +74,7 @@ #error Nazara requires a C++11 compliant compiler #endif -// Version du moteur +// Nazara version macro #define NAZARA_VERSION_MAJOR 0 #define NAZARA_VERSION_MINOR 1 @@ -97,7 +97,7 @@ #define NOMINMAX #endif - #if NAZARA_CORE_WINDOWS_VISTA + #if NAZARA_CORE_WINDOWS_NT6 // Version de Windows minimale : Vista #define NAZARA_WINNT 0x0600 #else diff --git a/src/Nazara/Core/Win32/ConditionVariableImpl.cpp b/src/Nazara/Core/Win32/ConditionVariableImpl.cpp index 002a9656a..a387a7638 100644 --- a/src/Nazara/Core/Win32/ConditionVariableImpl.cpp +++ b/src/Nazara/Core/Win32/ConditionVariableImpl.cpp @@ -12,7 +12,7 @@ namespace Nz { ConditionVariableImpl::ConditionVariableImpl() { - #if NAZARA_CORE_WINDOWS_VISTA + #if NAZARA_CORE_WINDOWS_NT6 InitializeConditionVariable(&m_cv); #else m_count = 0; @@ -21,7 +21,7 @@ namespace Nz #endif } - #if !NAZARA_CORE_WINDOWS_VISTA + #if !NAZARA_CORE_WINDOWS_NT6 ConditionVariableImpl::~ConditionVariableImpl() { CloseHandle(m_events[BROADCAST]); @@ -31,7 +31,7 @@ namespace Nz void ConditionVariableImpl::Signal() { - #if NAZARA_CORE_WINDOWS_VISTA + #if NAZARA_CORE_WINDOWS_NT6 WakeConditionVariable(&m_cv); #else if (m_count > 0) @@ -41,7 +41,7 @@ namespace Nz void ConditionVariableImpl::SignalAll() { - #if NAZARA_CORE_WINDOWS_VISTA + #if NAZARA_CORE_WINDOWS_NT6 WakeAllConditionVariable(&m_cv); #else if (m_count > 0) @@ -56,7 +56,7 @@ namespace Nz bool ConditionVariableImpl::Wait(MutexImpl* mutex, UInt32 timeout) { - #if NAZARA_CORE_WINDOWS_VISTA + #if NAZARA_CORE_WINDOWS_NT6 return SleepConditionVariableCS(&m_cv, &mutex->m_criticalSection, timeout) == TRUE; #else m_count++; diff --git a/src/Nazara/Core/Win32/ConditionVariableImpl.hpp b/src/Nazara/Core/Win32/ConditionVariableImpl.hpp index a1bb70deb..469cf6099 100644 --- a/src/Nazara/Core/Win32/ConditionVariableImpl.hpp +++ b/src/Nazara/Core/Win32/ConditionVariableImpl.hpp @@ -21,7 +21,7 @@ namespace Nz { public: ConditionVariableImpl(); - #if NAZARA_CORE_WINDOWS_VISTA + #if NAZARA_CORE_WINDOWS_NT6 ~ConditionVariableImpl() = default; #else ~ConditionVariableImpl(); @@ -34,7 +34,7 @@ namespace Nz bool Wait(MutexImpl* mutex, UInt32 timeout); private: - #if NAZARA_CORE_WINDOWS_VISTA + #if NAZARA_CORE_WINDOWS_NT6 CONDITION_VARIABLE m_cv; #else enum diff --git a/src/Nazara/Network/Win32/IpAddressImpl.cpp b/src/Nazara/Network/Win32/IpAddressImpl.cpp index 97d7a10e3..2dac156ce 100644 --- a/src/Nazara/Network/Win32/IpAddressImpl.cpp +++ b/src/Nazara/Network/Win32/IpAddressImpl.cpp @@ -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) diff --git a/src/Nazara/Network/Win32/IpAddressImpl.hpp b/src/Nazara/Network/Win32/IpAddressImpl.hpp index 000b407eb..e85dc7411 100644 --- a/src/Nazara/Network/Win32/IpAddressImpl.hpp +++ b/src/Nazara/Network/Win32/IpAddressImpl.hpp @@ -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); diff --git a/src/Nazara/Network/Win32/SocketImpl.hpp b/src/Nazara/Network/Win32/SocketImpl.hpp index ab93085d9..94e2e9a8c 100644 --- a/src/Nazara/Network/Win32/SocketImpl.hpp +++ b/src/Nazara/Network/Win32/SocketImpl.hpp @@ -12,7 +12,7 @@ #include #include -#define NAZARA_NETWORK_POLL_SUPPORT NAZARA_CORE_WINDOWS_VISTA +#define NAZARA_NETWORK_POLL_SUPPORT NAZARA_CORE_WINDOWS_NT6 namespace Nz {