summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-06-20 21:11:32 +0200
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-06-27 15:43:56 +0200
commitc34524743168af08812894ae635cd837fc77d403 (patch)
tree95225a8b52d44f96a2f4d76ffb0bf55d0005db19
parentCommon: Remove unused fifo_queue.h. (diff)
downloadyuzu-c34524743168af08812894ae635cd837fc77d403.tar
yuzu-c34524743168af08812894ae635cd837fc77d403.tar.gz
yuzu-c34524743168af08812894ae635cd837fc77d403.tar.bz2
yuzu-c34524743168af08812894ae635cd837fc77d403.tar.lz
yuzu-c34524743168af08812894ae635cd837fc77d403.tar.xz
yuzu-c34524743168af08812894ae635cd837fc77d403.tar.zst
yuzu-c34524743168af08812894ae635cd837fc77d403.zip
-rw-r--r--src/core/hle/service/soc_u.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp
index 1e0f5df9b..6a2cab414 100644
--- a/src/core/hle/service/soc_u.cpp
+++ b/src/core/hle/service/soc_u.cpp
@@ -3,9 +3,8 @@
// Refer to the license.txt file included.
#include "common/logging/log.h"
-#include "common/platform.h"
-#if EMU_PLATFORM == PLATFORM_WINDOWS
+#ifdef _WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
@@ -35,7 +34,7 @@
#include "core/hle/service/soc_u.h"
#include <unordered_map>
-#if EMU_PLATFORM == PLATFORM_WINDOWS
+#ifdef _WIN32
# define WSAEAGAIN WSAEWOULDBLOCK
# define WSAEMULTIHOP -1 // Invalid dummy value
# define ERRNO(x) WSA##x
@@ -369,7 +368,7 @@ static void Fcntl(Service::Interface* self) {
});
if (ctr_cmd == 3) { // F_GETFL
-#if EMU_PLATFORM == PLATFORM_WINDOWS
+#ifdef _WIN32
posix_ret = 0;
auto iter = open_sockets.find(socket_handle);
if (iter != open_sockets.end() && iter->second.blocking == false)
@@ -386,7 +385,7 @@ static void Fcntl(Service::Interface* self) {
posix_ret |= 4; // O_NONBLOCK
#endif
} else if (ctr_cmd == 4) { // F_SETFL
-#if EMU_PLATFORM == PLATFORM_WINDOWS
+#ifdef _WIN32
unsigned long tmp = (ctr_arg & 4 /* O_NONBLOCK */) ? 1 : 0;
int ret = ioctlsocket(socket_handle, FIONBIO, &tmp);
if (ret == SOCKET_ERROR_VALUE) {
@@ -675,7 +674,7 @@ static void Connect(Service::Interface* self) {
static void InitializeSockets(Service::Interface* self) {
// TODO(Subv): Implement
-#if EMU_PLATFORM == PLATFORM_WINDOWS
+#ifdef _WIN32
WSADATA data;
WSAStartup(MAKEWORD(2, 2), &data);
#endif
@@ -688,7 +687,7 @@ static void ShutdownSockets(Service::Interface* self) {
// TODO(Subv): Implement
CleanupSockets();
-#if EMU_PLATFORM == PLATFORM_WINDOWS
+#ifdef _WIN32
WSACleanup();
#endif
@@ -739,7 +738,7 @@ Interface::Interface() {
Interface::~Interface() {
CleanupSockets();
-#if EMU_PLATFORM == PLATFORM_WINDOWS
+#ifdef _WIN32
WSACleanup();
#endif
}