Browse Source

[internal_network] fix unix guards for apple

Signed-off-by: crueter <crueter@eden-emu.dev>
pull/284/head
crueter 7 months ago
parent
commit
244dacd44f
  1. 4
      src/core/internal_network/network.cpp
  2. 2
      src/core/internal_network/network.h
  3. 4
      src/core/internal_network/sockets.h

4
src/core/internal_network/network.cpp

@ -12,7 +12,7 @@
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#elif defined(__unix__)
#elif defined(__unix__) || defined(__APPLE__)
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
@ -162,7 +162,7 @@ Errno TranslateNativeError(int e, CallType call_type = CallType::Other) {
} }
} }
#elif defined(__unix__) // ^ _WIN32 v __unix__
#elif defined(__unix__) || defined(__APPLE__) // ^ _WIN32 v __unix__
using SOCKET = int; using SOCKET = int;
using WSAPOLLFD = pollfd; using WSAPOLLFD = pollfd;

2
src/core/internal_network/network.h

@ -104,7 +104,7 @@ constexpr IPv4Address TranslateIPv4(in_addr addr) {
auto& bytes = addr.S_un.S_un_b; auto& bytes = addr.S_un.S_un_b;
return IPv4Address{bytes.s_b1, bytes.s_b2, bytes.s_b3, bytes.s_b4}; return IPv4Address{bytes.s_b1, bytes.s_b2, bytes.s_b3, bytes.s_b4};
} }
#elif defined(__unix__)
#elif defined(__unix__) || defined(__APPLE__)
constexpr IPv4Address TranslateIPv4(in_addr addr) { constexpr IPv4Address TranslateIPv4(in_addr addr) {
const u32 bytes = addr.s_addr; const u32 bytes = addr.s_addr;
return IPv4Address{static_cast<u8>(bytes), static_cast<u8>(bytes >> 8), return IPv4Address{static_cast<u8>(bytes), static_cast<u8>(bytes >> 8),

4
src/core/internal_network/sockets.h

@ -10,7 +10,7 @@
#if defined(_WIN32) #if defined(_WIN32)
// windows // windows
#elif defined(__unix__)
#elif defined(__unix__) || defined(__APPLE__)
// unix // unix
#else #else
// haiku // haiku
@ -28,7 +28,7 @@ struct ProxyPacket;
class SocketBase { class SocketBase {
public: public:
#ifdef __unix__
#if defined(__unix__) || defined(__APPLE__)
using SOCKET = int; using SOCKET = int;
static constexpr SOCKET INVALID_SOCKET = -1; static constexpr SOCKET INVALID_SOCKET = -1;
static constexpr SOCKET SOCKET_ERROR = -1; static constexpr SOCKET SOCKET_ERROR = -1;

Loading…
Cancel
Save