From be1954e04cb5a0c3a526f78ed5490a5e65310280 Mon Sep 17 00:00:00 2001
From: Lioncash
Date: Thu, 15 Oct 2020 14:49:45 -0400
Subject: core: Fix clang build

Recent changes to the build system that made more warnings be flagged as
errors caused building via clang to break.

Fixes #4795
---
 src/core/network/sockets.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/core/network/sockets.h')

diff --git a/src/core/network/sockets.h b/src/core/network/sockets.h
index 7bdff0fe4..1682cbd4e 100644
--- a/src/core/network/sockets.h
+++ b/src/core/network/sockets.h
@@ -56,11 +56,11 @@ public:
 
     Errno Shutdown(ShutdownHow how);
 
-    std::pair<s32, Errno> Recv(int flags, std::vector<u8>& message);
+    std::pair<s32, Errno> Recv(u32 flags, std::vector<u8>& message);
 
-    std::pair<s32, Errno> RecvFrom(int flags, std::vector<u8>& message, SockAddrIn* addr);
+    std::pair<s32, Errno> RecvFrom(u32 flags, std::vector<u8>& message, SockAddrIn* addr);
 
-    std::pair<s32, Errno> Send(const std::vector<u8>& message, int flags);
+    std::pair<s32, Errno> Send(const std::vector<u8>& message, u32 flags);
 
     std::pair<s32, Errno> SendTo(u32 flags, const std::vector<u8>& message, const SockAddrIn* addr);
 
-- 
cgit v1.2.3


From 3d592972dc3fd61cc88771b889eff237e4e03e0f Mon Sep 17 00:00:00 2001
From: bunnei
Date: Tue, 20 Oct 2020 19:07:39 -0700
Subject: Revert "core: Fix clang build"

---
 src/core/network/sockets.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/core/network/sockets.h')

diff --git a/src/core/network/sockets.h b/src/core/network/sockets.h
index 1682cbd4e..7bdff0fe4 100644
--- a/src/core/network/sockets.h
+++ b/src/core/network/sockets.h
@@ -56,11 +56,11 @@ public:
 
     Errno Shutdown(ShutdownHow how);
 
-    std::pair<s32, Errno> Recv(u32 flags, std::vector<u8>& message);
+    std::pair<s32, Errno> Recv(int flags, std::vector<u8>& message);
 
-    std::pair<s32, Errno> RecvFrom(u32 flags, std::vector<u8>& message, SockAddrIn* addr);
+    std::pair<s32, Errno> RecvFrom(int flags, std::vector<u8>& message, SockAddrIn* addr);
 
-    std::pair<s32, Errno> Send(const std::vector<u8>& message, u32 flags);
+    std::pair<s32, Errno> Send(const std::vector<u8>& message, int flags);
 
     std::pair<s32, Errno> SendTo(u32 flags, const std::vector<u8>& message, const SockAddrIn* addr);
 
-- 
cgit v1.2.3


From 0e122c13ad42c9b782d556bfb1d6541499cd650e Mon Sep 17 00:00:00 2001
From: comex
Date: Mon, 31 Aug 2020 10:09:06 -0400
Subject: CMakeLists,network: Create YUZU_UNIX macro to replace __unix__

__unix__ is not predefined on Apple platforms even though they are Unix.
---
 src/core/network/sockets.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/core/network/sockets.h')

diff --git a/src/core/network/sockets.h b/src/core/network/sockets.h
index 7bdff0fe4..a44393325 100644
--- a/src/core/network/sockets.h
+++ b/src/core/network/sockets.h
@@ -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
 };
-- 
cgit v1.2.3