[myserver-commit] [3029] Use `ioctlsocket' to set non blocking operations only under Windows.

[Giuseppe Scrivano]

Revision: 3029
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3029
Author:   gscrivano
Date:     2009-03-27 21:20:48 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
Use `ioctlsocket' to set non blocking operations only under Windows.

Modified Paths:
--------------
    trunk/myserver/src/base/socket/socket.cpp

Modified: trunk/myserver/src/base/socket/socket.cpp
===================================================================
--- trunk/myserver/src/base/socket/socket.cpp   2009-03-26 21:52:28 UTC (rev 
3028)
+++ trunk/myserver/src/base/socket/socket.cpp   2009-03-27 21:20:48 UTC (rev 
3029)
@@ -686,13 +686,12 @@
 int Socket::setNonBlocking(int non_blocking)
 {
   int ret = -1;
-#ifdef FIONBIO
+#ifdef WIN32
   u_long nonblock = non_blocking ? 1 : 0;
   ret = ioctlsocket( FIONBIO, &nonblock);
 
 #else
 
-#ifdef NOT_WIN
   int flags;
   flags = fcntl((int)socketHandle, F_GETFL, 0);
   if (flags < 0)
@@ -704,9 +703,9 @@
     flags &= ~O_NONBLOCK;
 
   ret = fcntl((int)socketHandle, F_SETFL, flags);
-#endif
 
 #endif
+
   return ret;
 }