3 files changed, 13 insertions, 16 deletions
diff --git a/src/OSSupport/BlockingTCPLink.cpp b/src/OSSupport/BlockingTCPLink.cpp
index 55454a4b5..08aec0c65 100644
--- a/src/OSSupport/BlockingTCPLink.cpp
+++ b/src/OSSupport/BlockingTCPLink.cpp
@@ -7,17 +7,6 @@
 
 
 
-#ifdef _WIN32
-	#define MSG_NOSIGNAL (0)
-#endif
-#ifdef __MACH__
-	#define MSG_NOSIGNAL (0)
-#endif
-
-
-
-
-
 cBlockingTCPLink::cBlockingTCPLink(void)
 {
 }
diff --git a/src/OSSupport/Socket.cpp b/src/OSSupport/Socket.cpp
index f25f800c2..8ea5d8320 100644
--- a/src/OSSupport/Socket.cpp
+++ b/src/OSSupport/Socket.cpp
@@ -72,10 +72,6 @@ void cSocket::CloseSocket()
 	
 	#else  // _WIN32
 	
-	if (shutdown(m_Socket, SHUT_RDWR) != 0)//SD_BOTH);
-	{
-		LOGWARN("Error on shutting down socket %d (%s): %s", m_Socket, m_IPString.c_str(), GetLastErrorString().c_str());
-	}
 	if (close(m_Socket) != 0)
 	{
 		LOGWARN("Error closing socket %d (%s): %s", m_Socket, m_IPString.c_str(), GetLastErrorString().c_str());
@@ -368,7 +364,7 @@ int cSocket::Receive(char* a_Buffer, unsigned int a_Length, unsigned int a_Flags
 
 int cSocket::Send(const char * a_Buffer, unsigned int a_Length)
 {
-	return send(m_Socket, a_Buffer, a_Length, 0);
+	return send(m_Socket, a_Buffer, a_Length, MSG_NOSIGNAL);
 }
 
 
diff --git a/src/OSSupport/Socket.h b/src/OSSupport/Socket.h
index 81bfd28fc..b86560de8 100644
--- a/src/OSSupport/Socket.h
+++ b/src/OSSupport/Socket.h
@@ -5,6 +5,18 @@
 
 
 
+// Windows and MacOSX don't have the MSG_NOSIGNAL flag
+#if ( \
+	defined(_WIN32) || \
+	(defined(__APPLE__) && defined(__MACH__)) \
+)
+	#define MSG_NOSIGNAL (0)
+#endif
+
+
+
+
+
 class cSocket
 {
 public: