diff options
| author | bunnei <bunneidev@gmail.com> | 2020-12-07 15:32:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 15:32:06 -0800 |
| commit | 1613bbab8af1390e2e3311de37e23091f1fa57ce (patch) | |
| tree | dc4f6ebabd5d0e9fe2abc9995f997faf56d3a73a /src/core/network/network.cpp | |
| parent | 72378f4f6c3e6dcd85ee96740aba54027fd1d324 (diff) | |
| parent | 3c7962df416316d945c91d4b79dfae9ece1f15aa (diff) | |
Merge pull request #5153 from comex/xx-unix
CMakeLists,network: Create YUZU_UNIX macro to replace __unix__
Diffstat (limited to 'src/core/network/network.cpp')
| -rw-r--r-- | src/core/network/network.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/network/network.cpp b/src/core/network/network.cpp index 5ef2e85111..5a8cc6fc2f 100644 --- a/src/core/network/network.cpp +++ b/src/core/network/network.cpp @@ -11,7 +11,7 @@ #ifdef _WIN32 #define _WINSOCK_DEPRECATED_NO_WARNINGS // gethostname #include <winsock2.h> -#elif __unix__ +#elif YUZU_UNIX #include <errno.h> #include <fcntl.h> #include <netdb.h> @@ -54,7 +54,7 @@ constexpr IPv4Address TranslateIPv4(in_addr addr) { sockaddr TranslateFromSockAddrIn(SockAddrIn input) { sockaddr_in result; -#ifdef __unix__ +#if YUZU_UNIX result.sin_len = sizeof(result); #endif @@ -99,7 +99,7 @@ bool EnableNonBlock(SOCKET fd, bool enable) { return ioctlsocket(fd, FIONBIO, &value) != SOCKET_ERROR; } -#elif __unix__ // ^ _WIN32 v __unix__ +#elif YUZU_UNIX // ^ _WIN32 v YUZU_UNIX using SOCKET = int; using WSAPOLLFD = pollfd; |