diff options
| author | lizzie <lizzie@eden-emu.dev> | 2025-10-22 04:53:40 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2025-10-22 04:53:40 +0200 |
| commit | 87cacbeed49facf18355c55cc93d0a2a0142be09 (patch) | |
| tree | 320ab5933dd97b5f54f5fcc2cb4ed775587c9cbf /src/core/internal_network | |
| parent | 992bae4e2a14ca2547c09637b7dc6fc5f73b353a (diff) | |
[compat] HaikuOS port (#2805)
Still had the issues with libusb, but that should get solved with the other PRs anyways
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2805
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
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 | 6 | ||||
| -rw-r--r-- | src/core/internal_network/network.h | 5 | ||||
| -rw-r--r-- | src/core/internal_network/sockets.h | 14 |
3 files changed, 10 insertions, 15 deletions
diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index b21d8a7a16..35f2157761 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -15,7 +15,7 @@ #ifdef _WIN32 #include <winsock2.h> #include <ws2tcpip.h> -#elif defined(__unix__) || defined(__APPLE__) +#else #include <arpa/inet.h> #include <errno.h> #include <fcntl.h> @@ -24,8 +24,6 @@ #include <poll.h> #include <sys/socket.h> #include <unistd.h> -#else -#error "Unimplemented platform" #endif #include "common/assert.h" @@ -165,7 +163,7 @@ Errno TranslateNativeError(int e, CallType call_type = CallType::Other) { } } -#elif defined(__unix__) || defined(__APPLE__) // ^ _WIN32 v __unix__ +#else // ^^^ Windows vvv POSIX using SOCKET = int; using WSAPOLLFD = pollfd; diff --git a/src/core/internal_network/network.h b/src/core/internal_network/network.h index 5a3343efd9..5df28911f8 100644 --- a/src/core/internal_network/network.h +++ b/src/core/internal_network/network.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -104,7 +107,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 defined(__unix__) || defined(__APPLE__) +#else 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/sockets.h b/src/core/internal_network/sockets.h index 27468709fd..0b751b6622 100644 --- a/src/core/internal_network/sockets.h +++ b/src/core/internal_network/sockets.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -8,15 +11,6 @@ #include <span> #include <utility> -#if defined(_WIN32) -// windows -#elif defined(__unix__) || defined(__APPLE__) -// unix -#else -// haiku -#error "Platform not implemented" -#endif - #include "common/common_types.h" #include "core/internal_network/network.h" @@ -28,7 +22,7 @@ struct ProxyPacket; class SocketBase { public: -#if defined(__unix__) || defined(__APPLE__) +#ifndef _WIN32 using SOCKET = int; static constexpr SOCKET INVALID_SOCKET = -1; static constexpr SOCKET SOCKET_ERROR = -1; |
