diff options
| author | lizzie <lizzie@eden-emu.dev> | 2025-08-15 04:12:45 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2025-08-15 04:12:45 +0200 |
| commit | e807e32b1aee1daff61b8ebf61f7b38bd895a8c9 (patch) | |
| tree | 3e01449fd9ef0b39f87cf304d13d6690a4337bc8 /src/core/internal_network | |
| parent | c39e3bece60fb0af6fa1652bee87c2cb8f75dd80 (diff) | |
[compat] fix solaris Qt build (#194)
Co-authored-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/194
Reviewed-by: crueter <crueter@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'src/core/internal_network')
| -rw-r--r-- | src/core/internal_network/network.cpp | 8 | ||||
| -rw-r--r-- | src/core/internal_network/network.h | 4 | ||||
| -rw-r--r-- | src/core/internal_network/socket_proxy.cpp | 2 | ||||
| -rw-r--r-- | src/core/internal_network/sockets.h | 8 |
4 files changed, 13 insertions, 9 deletions
diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index 7785c1d163..49179617a7 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -12,7 +12,7 @@ #ifdef _WIN32 #include <winsock2.h> #include <ws2tcpip.h> -#elif YUZU_UNIX +#elif defined(__unix__) #include <arpa/inet.h> #include <errno.h> #include <fcntl.h> @@ -77,7 +77,7 @@ SOCKET GetInterruptSocket() { sockaddr TranslateFromSockAddrIn(SockAddrIn input) { sockaddr_in result; -#if YUZU_UNIX +#ifdef __unix__ result.sin_len = sizeof(result); #endif @@ -162,7 +162,7 @@ Errno TranslateNativeError(int e, CallType call_type = CallType::Other) { } } -#elif YUZU_UNIX // ^ _WIN32 v YUZU_UNIX +#elif defined(__unix__) // ^ _WIN32 v __unix__ using SOCKET = int; using WSAPOLLFD = pollfd; @@ -835,7 +835,7 @@ std::pair<s32, Errno> Socket::Send(std::span<const u8> message, int flags) { ASSERT(flags == 0); int native_flags = 0; -#if YUZU_UNIX +#ifdef __unix__ native_flags |= MSG_NOSIGNAL; // do not send us SIGPIPE #endif const auto result = send(fd, reinterpret_cast<const char*>(message.data()), diff --git a/src/core/internal_network/network.h b/src/core/internal_network/network.h index b7b7d773a4..64f3f121df 100644 --- a/src/core/internal_network/network.h +++ b/src/core/internal_network/network.h @@ -13,7 +13,7 @@ #ifdef _WIN32 #include <winsock2.h> -#elif YUZU_UNIX +#else #include <netinet/in.h> #endif @@ -104,7 +104,7 @@ constexpr IPv4Address TranslateIPv4(in_addr addr) { auto& bytes = addr.S_un.S_un_b; return IPv4Address{bytes.s_b1, bytes.s_b2, bytes.s_b3, bytes.s_b4}; } -#elif YUZU_UNIX +#elif defined(__unix__) constexpr IPv4Address TranslateIPv4(in_addr addr) { const u32 bytes = addr.s_addr; return IPv4Address{static_cast<u8>(bytes), static_cast<u8>(bytes >> 8), diff --git a/src/core/internal_network/socket_proxy.cpp b/src/core/internal_network/socket_proxy.cpp index eba1e28c5e..c263fb4ca8 100644 --- a/src/core/internal_network/socket_proxy.cpp +++ b/src/core/internal_network/socket_proxy.cpp @@ -15,7 +15,7 @@ #include "core/internal_network/socket_proxy.h" #include "network/network.h" -#if YUZU_UNIX +#ifdef __unix__ #include <sys/socket.h> #endif diff --git a/src/core/internal_network/sockets.h b/src/core/internal_network/sockets.h index 3a32dff75d..65ebb893ad 100644 --- a/src/core/internal_network/sockets.h +++ b/src/core/internal_network/sockets.h @@ -9,7 +9,11 @@ #include <utility> #if defined(_WIN32) -#elif !YUZU_UNIX +// windows +#elif defined(__unix__) +// unix +#else +// haiku #error "Platform not implemented" #endif @@ -24,7 +28,7 @@ struct ProxyPacket; class SocketBase { public: -#ifdef YUZU_UNIX +#ifdef __unix__ using SOCKET = int; static constexpr SOCKET INVALID_SOCKET = -1; static constexpr SOCKET SOCKET_ERROR = -1; |
