franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5153 from comex/xx-unix 

CMakeLists,network: Create YUZU_UNIX macro to replace __unix__
This commit is contained in:
bunnei 2020-12-07 15:32:06 -08:00 committed by GitHub
parent 5cd051eced 0e122c13ad
commit f782aecf4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -113,6 +113,9 @@ if (NOT DEFINED ARCHITECTURE)
endif() endif()
message(STATUS "Target architecture: ${ARCHITECTURE}") message(STATUS "Target architecture: ${ARCHITECTURE}")
if (UNIX)
add_definitions(-DYUZU_UNIX=1)
endif()
# Configure C++ standard # Configure C++ standard
# =========================== # ===========================

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

@ -11,7 +11,7 @@
#ifdef _WIN32 #ifdef _WIN32
#define _WINSOCK_DEPRECATED_NO_WARNINGS // gethostname #define _WINSOCK_DEPRECATED_NO_WARNINGS // gethostname
#include <winsock2.h> #include <winsock2.h>
#elif __unix__ #elif YUZU_UNIX
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <netdb.h> #include <netdb.h>
@ -54,7 +54,7 @@ constexpr IPv4Address TranslateIPv4(in_addr addr) {
sockaddr TranslateFromSockAddrIn(SockAddrIn input) { sockaddr TranslateFromSockAddrIn(SockAddrIn input) {
sockaddr_in result; sockaddr_in result;
#ifdef __unix__ #if YUZU_UNIX
result.sin_len = sizeof(result); result.sin_len = sizeof(result);
#endif #endif
@ -99,7 +99,7 @@ bool EnableNonBlock(SOCKET fd, bool enable) {
return ioctlsocket(fd, FIONBIO, &value) != SOCKET_ERROR; return ioctlsocket(fd, FIONBIO, &value) != SOCKET_ERROR;
} }
#elif __unix__ // ^ _WIN32 v __unix__ #elif YUZU_UNIX // ^ _WIN32 v YUZU_UNIX
using SOCKET = int; using SOCKET = int;
using WSAPOLLFD = pollfd; using WSAPOLLFD = pollfd;

4
src/core/network/sockets.h
View File

@ -9,7 +9,7 @@
#if defined(_WIN32) #if defined(_WIN32)
#include <winsock.h> #include <winsock.h>
#elif !defined(__unix__) #elif !YUZU_UNIX
#error "Platform not implemented" #error "Platform not implemented"
#endif #endif
@ -84,7 +84,7 @@ public:
#if defined(_WIN32) #if defined(_WIN32)
SOCKET fd = INVALID_SOCKET; SOCKET fd = INVALID_SOCKET;
#elif defined(__unix__) #elif YUZU_UNIX
int fd = -1; int fd = -1;
#endif #endif
}; };