dburr/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-07-23 08:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CMakeLists,network: Create YUZU_UNIX macro to replace __unix__

Browse source 
__unix__ is not predefined on Apple platforms even though they are Unix.
This commit is contained in:
comex 2020-08-31 10:09:06 -04:00
parent 03aee5c798
commit 3c7962df41
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/network/network.cpp
View file

@ -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;