From 262be4a358a40ed46ee00e8f2ed7a0619a2e5d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Miko=C5=82ajczyk?= Date: Mon, 14 Jul 2025 22:47:36 +0100 Subject: [PATCH] fix2 --- externals/CMakeLists.txt | 2 ++ src/core/libraries/network/net_epoll.h | 2 +- src/core/libraries/network/net_util.cpp | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 7dfa67bde..4d7e3db04 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -140,6 +140,8 @@ endif() # sirit add_subdirectory(sirit) if (WIN32) + add_library(wepoll wepoll/wepoll.c) + target_include_directories(wepoll INTERFACE wepoll/) target_compile_options(sirit PUBLIC "-Wno-error=unused-command-line-argument") endif() diff --git a/src/core/libraries/network/net_epoll.h b/src/core/libraries/network/net_epoll.h index 6bdbe4814..c32db254b 100644 --- a/src/core/libraries/network/net_epoll.h +++ b/src/core/libraries/network/net_epoll.h @@ -10,7 +10,7 @@ #include #ifdef _WIN32 -#include +#include #endif #if defined(__linux__) || defined(__APPLE__) diff --git a/src/core/libraries/network/net_util.cpp b/src/core/libraries/network/net_util.cpp index 826540cb2..a765724f3 100644 --- a/src/core/libraries/network/net_util.cpp +++ b/src/core/libraries/network/net_util.cpp @@ -167,15 +167,15 @@ bool NetUtilInternal::RetrieveNetmask() { std::vector adapter_addresses(sizeof(IP_ADAPTER_ADDRESSES)); ULONG size_infos = sizeof(IP_ADAPTER_ADDRESSES); - if (GetAdaptersInfo(reinterpret_cast(adapter_addresses.data()), + if (GetAdaptersAddresses(AF_INET, 0, NULL, reinterpret_cast(adapter_addresses.data()), &size_infos) == ERROR_BUFFER_OVERFLOW) adapter_addresses.resize(size_infos); - if (GetAdaptersInfo(reinterpret_cast(adapter_addresses.data()), + if (GetAdaptersAddresses(AF_INET, 0, NULL, reinterpret_cast(adapter_addresses.data()), &size_infos) == NO_ERROR && size_infos) { PIP_ADAPTER_ADDRESSES adapter; - for (adapter = adapter_addresses; adapter; adapter = adapter->Next) { + for (adapter = reinterpret_cast(adapter_addresses.data()); adapter; adapter = adapter->Next) { PIP_ADAPTER_UNICAST_ADDRESS unicast = adapter->FirstUnicastAddress; if (unicast) { ULONG prefix_length = unicast->OnLinkPrefixLength;