diff options
| author | comex <comexk@gmail.com> | 2023-06-26 02:00:05 +0200 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2023-06-26 02:06:57 +0200 |
| commit | ac939f08a4c116b6a38978358b667b1fa0c51ef9 (patch) | |
| tree | d056a56751a46f31b2b4f8e2d7b0de31fc5de1db /src/core/internal_network | |
| parent | ssl: fix compatibility with OpenSSL 1.1.1 (diff) | |
| download | yuzu-ac939f08a4c116b6a38978358b667b1fa0c51ef9.tar yuzu-ac939f08a4c116b6a38978358b667b1fa0c51ef9.tar.gz yuzu-ac939f08a4c116b6a38978358b667b1fa0c51ef9.tar.bz2 yuzu-ac939f08a4c116b6a38978358b667b1fa0c51ef9.tar.lz yuzu-ac939f08a4c116b6a38978358b667b1fa0c51ef9.tar.xz yuzu-ac939f08a4c116b6a38978358b667b1fa0c51ef9.tar.zst yuzu-ac939f08a4c116b6a38978358b667b1fa0c51ef9.zip | |
Diffstat (limited to 'src/core/internal_network')
| -rw-r--r-- | src/core/internal_network/network.cpp | 4 | ||||
| -rw-r--r-- | src/core/internal_network/network.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index 0164d12eb..40e451526 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -493,9 +493,7 @@ u32 IPv4AddressToInteger(IPv4Address ip_addr) { static_cast<u32>(ip_addr[2]) << 8 | static_cast<u32>(ip_addr[3]); } -#undef GetAddrInfo // Windows defines it as a macro - -Common::Expected<std::vector<AddrInfo>, GetAddrInfoError> GetAddrInfo( +Common::Expected<std::vector<AddrInfo>, GetAddrInfoError> GetAddressInfo( const std::string& host, const std::optional<std::string>& service) { addrinfo hints{}; hints.ai_family = AF_INET; // Switch only supports IPv4. diff --git a/src/core/internal_network/network.h b/src/core/internal_network/network.h index 96319bfc8..badcb8369 100644 --- a/src/core/internal_network/network.h +++ b/src/core/internal_network/network.h @@ -5,6 +5,7 @@ #include <array> #include <optional> +#include <vector> #include "common/common_funcs.h" #include "common/common_types.h" @@ -113,7 +114,8 @@ std::optional<IPv4Address> GetHostIPv4Address(); std::string IPv4AddressToString(IPv4Address ip_addr); u32 IPv4AddressToInteger(IPv4Address ip_addr); -Common::Expected<std::vector<AddrInfo>, GetAddrInfoError> GetAddrInfo( +// named to avoid name collision with Windows macro +Common::Expected<std::vector<AddrInfo>, GetAddrInfoError> GetAddressInfo( const std::string& host, const std::optional<std::string>& service); } // namespace Network |