Merge remote-tracking branch 'origin/master' into ECS

daid · Nov 6, 2024 · a1174ef · a1174ef
2 parents c72caf0 + af1daf4
commit a1174ef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/io/network/tcpSocket.cpp b/src/io/network/tcpSocket.cpp
@@ -25,7 +25,11 @@ static inline int recv(SOCKET s, void* buf, size_t len, int flags)
 #include <arpa/inet.h>
 #include <string.h>
 #include <poll.h>
+#if defined(__APPLE__)
+static constexpr int flags = 0;
+#else
 static constexpr int flags = MSG_NOSIGNAL;
+#endif
 static constexpr intptr_t INVALID_SOCKET = -1;
 #endif
 

diff --git a/src/io/network/udpSocket.cpp b/src/io/network/udpSocket.cpp
@@ -23,7 +23,11 @@ static inline int sendto(SOCKET s, const void* msg, size_t len, int flags, const
 #include <arpa/inet.h>
 #include <string.h>
 #include <netdb.h>
+#if defined(__APPLE__)
+static constexpr int flags = 0;
+#else
 static constexpr int flags = MSG_NOSIGNAL;
+#endif
 static constexpr intptr_t INVALID_SOCKET = -1;
 // Define IPV6_ADD_MEMBERSHIP for FreeBSD and Mac OS X
 #ifndef IPV6_ADD_MEMBERSHIP