X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fsockets.cpp;h=d2a27d7e01848315d92ff3aaf407a0ac3128f850;hb=4097617940e50a7980bac412b945acd937b2292c;hp=e08680beda0f47e45a8374933819cf42ea047d92;hpb=231225d6f97d0b926b2e896e5783cccfbc7c5619;p=xonotic%2Fnetradiant.git

diff --git a/radiant/sockets.cpp b/radiant/sockets.cpp
index e08680be..d2a27d7e 100644
--- a/radiant/sockets.cpp
+++ b/radiant/sockets.cpp
@@ -1,47 +1,45 @@
-
 #include "sockets.h"
+#include "globaldefs.h"
 
-#if defined(WIN32)
+#if GDEF_OS_WINDOWS
 #include <winsock2.h>
-#elif defined (POSIX)
+#elif GDEF_OS_POSIX
 #include <sys/time.h>
-#define SOCKET_ERROR -1
+const int SOCKET_ERROR = -1;
 #else
 #error "unsupported platform"
 #endif
 
-#ifdef __APPLE__
+#if GDEF_OS_MACOS
 #include <unistd.h>
 #endif
 
-int Net_Wait(socket_t *sock, long sec, long usec)
-{
+int Net_Wait( socket_t *sock, long sec, long usec ){
 // used for select()
-#ifdef WIN32
-  TIMEVAL tout = { sec, usec };
+#if GDEF_OS_WINDOWS
+	TIMEVAL tout = { sec, usec };
 #endif
-#if defined (POSIX)
+#if GDEF_OS_POSIX
 	timeval tout;
 	tout.tv_sec = sec;
 	tout.tv_usec = usec;
 #endif
 
-  // select() will identify if the socket needs an update
-  // if the socket is identified that means there's either a message or the connection has been closed/reset/terminated
-  fd_set readfds;
-  FD_ZERO(&readfds);
-  FD_SET(((unsigned int)sock->socket), &readfds);
+	// select() will identify if the socket needs an update
+	// if the socket is identified that means there's either a message or the connection has been closed/reset/terminated
+	fd_set readfds;
+	FD_ZERO( &readfds );
+	FD_SET( ( (unsigned int)sock->socket ), &readfds );
 	// from select man page:
 	// n is the highest-numbered descriptor in any of the three sets, plus 1
 	// (no use on windows)
-  switch( select( sock->socket + 1, &readfds, 0, 0, &tout ) )
-  {
-  case SOCKET_ERROR:
-    return -1;
-  case 0:
-    return 0;
-  default:
-    return 1;
-  }
+	switch ( select( sock->socket + 1, &readfds, 0, 0, &tout ) )
+	{
+	case SOCKET_ERROR:
+		return -1;
+	case 0:
+		return 0;
+	default:
+		return 1;
+	}
 }
-