[GNUnet-SVN] r5653 - GNUnet/src/util/network

[gnunet]

Author: durner
Date: 2007-09-23 04:02:20 -0600 (Sun, 23 Sep 2007)
New Revision: 5653

Modified:
   GNUnet/src/util/network/io.c
   GNUnet/src/util/network/select.c
Log:
MinGW

Modified: GNUnet/src/util/network/io.c
===================================================================
--- GNUnet/src/util/network/io.c        2007-09-21 20:22:36 UTC (rev 5652)
+++ GNUnet/src/util/network/io.c        2007-09-23 10:02:20 UTC (rev 5653)
@@ -190,7 +190,7 @@
   else
     {
       /* store the blocking mode */
-      __win_SetHandleBlockingMode (s->handle, doBlock);
+      plibc_fd_set_blocking(s->handle, doBlock);
       return 0;
     }
 #else
@@ -209,7 +209,7 @@
 #ifndef MINGW
   return (fcntl (s->handle, F_GETFL) & O_NONBLOCK) ? NO : YES;
 #else
-  return __win_IsHandleMarkedAsBlocking (s->handle);
+  return plibc_fd_get_blocking(s->handle);
 #endif
 }
 
@@ -524,8 +524,7 @@
   struct stat buf;
   return -1 != fstat (s->handle, &buf);
 #else
-  long l;
-  return ioctlsocket (s->handle, FIONREAD, &l) != SOCKET_ERROR;
+  return _win_isSocketValid(s->handle);
 #endif
 }
 

Modified: GNUnet/src/util/network/select.c
===================================================================
--- GNUnet/src/util/network/select.c    2007-09-21 20:22:36 UTC (rev 5652)
+++ GNUnet/src/util/network/select.c    2007-09-23 10:02:20 UTC (rev 5653)
@@ -774,7 +774,7 @@
   mode = PIPE_NOWAIT;
 
   if (SetNamedPipeHandleState ((HANDLE) handle, &mode, NULL, NULL))
-    __win_SetHandleBlockingMode (handle, 0);
+    plibc_fd_set_blocking(handle, 0);
   /* don't report errors because Win9x doesn't support 
SetNamedPipeHandleState() */
 #else
   int flags = fcntl (handle, F_GETFL);