diff --git a/src/Nazara/Core/Win32/ThreadImpl.cpp b/src/Nazara/Core/Win32/ThreadImpl.cpp index 5a0f8686e..9a8abe64f 100644 --- a/src/Nazara/Core/Win32/ThreadImpl.cpp +++ b/src/Nazara/Core/Win32/ThreadImpl.cpp @@ -118,7 +118,7 @@ namespace Nz::PlatformImpl static SetThreadDescriptionFunc SetThreadDescription = reinterpret_cast(::GetProcAddress(::GetModuleHandleW(L"Kernel32.dll"), "SetThreadDescription")); if (SetThreadDescription) SetThreadDescription(threadHandle, ToWideString(threadName).data()); -#if NAZARA_UTILS_WINDOWS_NT6 +#if NAZARAUTILS_WINDOWS_NT6 else RaiseThreadNameException(::GetThreadId(threadHandle), threadName); #else diff --git a/src/Nazara/Core/Win32/TimeImpl.cpp b/src/Nazara/Core/Win32/TimeImpl.cpp index d5d12632b..ab67e83eb 100644 --- a/src/Nazara/Core/Win32/TimeImpl.cpp +++ b/src/Nazara/Core/Win32/TimeImpl.cpp @@ -51,7 +51,7 @@ namespace Nz Time GetElapsedMillisecondsImpl() { -#if NAZARA_UTILS_WINDOWS_NT6 +#if NAZARAUTILS_WINDOWS_NT6 return Time::Milliseconds(GetTickCount64()); #else return Time::Milliseconds(GetTickCount()); diff --git a/src/Nazara/Network/Win32/IpAddressImpl.cpp b/src/Nazara/Network/Win32/IpAddressImpl.cpp index 60c1ef766..b21fc1947 100644 --- a/src/Nazara/Network/Win32/IpAddressImpl.cpp +++ b/src/Nazara/Network/Win32/IpAddressImpl.cpp @@ -24,7 +24,7 @@ namespace Nz { namespace Detail { -#if NAZARA_UTILS_WINDOWS_NT6 +#if NAZARAUTILS_WINDOWS_NT6 using addrinfoImpl = addrinfoW; int GetAddressInfo(const std::string& hostname, const std::string& service, const addrinfoImpl* hints, addrinfoImpl** results) @@ -119,7 +119,7 @@ namespace Nz return IpAddress::Invalid; } -#if NAZARA_UTILS_WINDOWS_NT6 +#if NAZARAUTILS_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 52646a1f5..c50f93f42 100644 --- a/src/Nazara/Network/Win32/IpAddressImpl.hpp +++ b/src/Nazara/Network/Win32/IpAddressImpl.hpp @@ -23,7 +23,7 @@ namespace Nz ~IpAddressImpl() = delete; static IpAddress FromAddrinfo(const addrinfo* info); -#if NAZARA_UTILS_WINDOWS_NT6 +#if NAZARAUTILS_WINDOWS_NT6 static IpAddress FromAddrinfo(const addrinfoW* info); #endif static IpAddress FromSockAddr(const sockaddr* address); diff --git a/src/Nazara/Network/Win32/SocketImpl.cpp b/src/Nazara/Network/Win32/SocketImpl.cpp index 638a29a93..a002420b6 100644 --- a/src/Nazara/Network/Win32/SocketImpl.cpp +++ b/src/Nazara/Network/Win32/SocketImpl.cpp @@ -449,7 +449,7 @@ namespace Nz SocketState SocketImpl::PollConnection(SocketHandle handle, const IpAddress& /*address*/, UInt64 msTimeout, SocketError* error) { // Wait until socket is available for writing or an error occurs (ie when connection succeeds or fails) -#if NAZARA_UTILS_WINDOWS_NT6 +#if NAZARAUTILS_WINDOWS_NT6 WSAPOLLFD descriptor; descriptor.events = POLLWRNORM; descriptor.fd = handle; @@ -480,7 +480,7 @@ namespace Nz } else if (ret > 0) { -#if NAZARA_UTILS_WINDOWS_NT6 +#if NAZARAUTILS_WINDOWS_NT6 if (descriptor.revents & (POLLERR | POLLHUP)) #else if (FD_ISSET(handle, &errSet)) @@ -491,7 +491,7 @@ namespace Nz return SocketState::NotConnected; } -#if NAZARA_UTILS_WINDOWS_NT6 +#if NAZARAUTILS_WINDOWS_NT6 else if (descriptor.revents & POLLWRNORM) #else else if (FD_ISSET(handle, &writeSet)) @@ -499,7 +499,7 @@ namespace Nz return SocketState::Connected; else { -#if NAZARA_UTILS_WINDOWS_NT6 +#if NAZARAUTILS_WINDOWS_NT6 NazaraWarningFmt("Socket {0} was returned by poll without POLLOUT nor error events (events: {1:#x})", handle, descriptor.revents); #else NazaraWarningFmt("Socket {0} was returned by select but is not part of the write nor exception set", handle); @@ -851,7 +851,7 @@ namespace Nz bool SocketImpl::SetIPv6Only(SocketHandle handle, bool ipv6Only, SocketError* error) { -#if NAZARA_UTILS_WINDOWS_NT6 +#if NAZARAUTILS_WINDOWS_NT6 NazaraAssert(handle != InvalidHandle, "Invalid handle"); DWORD option = ipv6Only; diff --git a/src/Nazara/Network/Win32/SocketImpl.hpp b/src/Nazara/Network/Win32/SocketImpl.hpp index 8b0a02296..5941604f6 100644 --- a/src/Nazara/Network/Win32/SocketImpl.hpp +++ b/src/Nazara/Network/Win32/SocketImpl.hpp @@ -13,7 +13,7 @@ #include #include -#define NAZARA_NETWORK_POLL_SUPPORT NAZARA_UTILS_WINDOWS_NT6 +#define NAZARA_NETWORK_POLL_SUPPORT NAZARAUTILS_WINDOWS_NT6 namespace Nz { diff --git a/xmake.lua b/xmake.lua index 80f211acc..ff8e79e40 100644 --- a/xmake.lua +++ b/xmake.lua @@ -263,7 +263,7 @@ end add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo") -add_requires("entt 3.12.2", "fmt", "frozen", "nazarautils >=2023.11.12") +add_requires("entt 3.12.2", "fmt", "frozen", "nazarautils >=2023.12.28") -- Module dependencies if has_config("audio") then @@ -555,7 +555,7 @@ for name, module in pairs(modules) do end if is_plat("windows", "mingw") then - add_defines("NAZARA_UTILS_WINDOWS_NT6=1") + add_defines("NAZARAUTILS_WINDOWS_NT6=1") end ModuleTargetConfig(name, module)