mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-12-23 19:46:44 +00:00
CMakeLists,network: Create YUZU_UNIX macro to replace __unix__
__unix__ is not predefined on Apple platforms even though they are Unix.
This commit is contained in:
parent
0dc234c5ea
commit
0e122c13ad
|
@ -113,6 +113,9 @@ if (NOT DEFINED ARCHITECTURE)
|
|||
endif()
|
||||
message(STATUS "Target architecture: ${ARCHITECTURE}")
|
||||
|
||||
if (UNIX)
|
||||
add_definitions(-DYUZU_UNIX=1)
|
||||
endif()
|
||||
|
||||
# Configure C++ standard
|
||||
# ===========================
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#if defined(_WIN32)
|
||||
#include <winsock.h>
|
||||
#elif !defined(__unix__)
|
||||
#elif !YUZU_UNIX
|
||||
#error "Platform not implemented"
|
||||
#endif
|
||||
|
||||
|
@ -84,7 +84,7 @@ public:
|
|||
|
||||
#if defined(_WIN32)
|
||||
SOCKET fd = INVALID_SOCKET;
|
||||
#elif defined(__unix__)
|
||||
#elif YUZU_UNIX
|
||||
int fd = -1;
|
||||
#endif
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue