# HG changeset patch
# User rubidium <rubidium@openttd.org>
# Date 2007-02-11 13:39:23
# Node ID e1f08be8192a61ad4f2f002f8b7ca3cd56927c58
# Parent  e11b6f5200f982ce9a983465b6ba8e3e5c09562d

(svn r8673) -Codechange: use SetNonBlocking instead of implementing yet another version.

diff --git a/src/network/core/os_abstraction.h b/src/network/core/os_abstraction.h
--- a/src/network/core/os_abstraction.h
+++ b/src/network/core/os_abstraction.h
@@ -153,7 +153,7 @@ typedef unsigned long in_addr_t;
 #	endif
 #endif // __MORPHOS__ || __AMIGA__
 
-static inline bool SetNonBlocking(const int d)
+static inline bool SetNonBlocking(SOCKET d)
 {
 #ifdef WIN32
 	u_long nonblocking = 1;
@@ -167,7 +167,7 @@ static inline bool SetNonBlocking(const 
 #endif
 }
 
-static inline bool SetNoDelay(const int d)
+static inline bool SetNoDelay(SOCKET d)
 {
 	/* XXX should this be done at all? */
 #if !defined(BEOS_NET_SERVER) // not implemented on BeOS net_server
diff --git a/src/network/core/udp.cpp b/src/network/core/udp.cpp
--- a/src/network/core/udp.cpp
+++ b/src/network/core/udp.cpp
@@ -33,15 +33,7 @@ bool NetworkUDPSocketHandler::Listen(con
 		return false;
 	}
 
-	/* set nonblocking mode for socket */
-	{
-		unsigned long blocking = 1;
-#ifndef BEOS_NET_SERVER
-		ioctlsocket(this->sock, FIONBIO, &blocking);
-#else
-		setsockopt(this->sock, SOL_SOCKET, SO_NONBLOCK, &blocking, NULL);
-#endif
-	}
+	SetNonBlocking(this->sock);
 
 	sin.sin_family = AF_INET;
 	/* Listen on all IPs */