From: sof <unknown>
Date: Thu, 14 Feb 2002 16:55:07 +0000 (+0000)
Subject: [project @ 2002-02-14 16:55:07 by sof]
X-Git-Tag: Approximately_9120_patches~45
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=6319ebf3812a7fbf526b36930666a71c95f199d7;p=ghc-hetmet.git

[project @ 2002-02-14 16:55:07 by sof]
resetNonBlockingFd, setNonBlockingFd: mingw tidyup
---

diff --git a/ghc/rts/RtsUtils.c b/ghc/rts/RtsUtils.c
index 0e302a7..e077204 100644
--- a/ghc/rts/RtsUtils.c
+++ b/ghc/rts/RtsUtils.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsUtils.c,v 1.23 2001/10/31 10:30:29 simonmar Exp $
+ * $Id: RtsUtils.c,v 1.24 2002/02/14 16:55:07 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -224,18 +224,17 @@ time_str(void)
  * clean up for us.
  * -------------------------------------------------------------------------- */
 
+#if !defined(mingw32_TARGET_OS)
 void
 resetNonBlockingFd(int fd)
 {
   long fd_flags;
 
-#if !defined(mingw32_TARGET_OS)
   /* clear the non-blocking flag on this file descriptor */
   fd_flags = fcntl(fd, F_GETFL);
   if (fd_flags & O_NONBLOCK) {
     fcntl(fd, F_SETFL, fd_flags & ~O_NONBLOCK);
   }
-#endif
 }
 
 void
@@ -243,12 +242,15 @@ setNonBlockingFd(int fd)
 {
   long fd_flags;
 
-#if !defined(mingw32_TARGET_OS)
   /* clear the non-blocking flag on this file descriptor */
   fd_flags = fcntl(fd, F_GETFL);
   fcntl(fd, F_SETFL, fd_flags | O_NONBLOCK);
-#endif
 }
+#else
+/* Don't support non-blocking FDs (yet) on mingw */
+void resetNonBlockingFd(int fd STG_UNUSED) {}
+void setNonBlockingFd(int fd STG_UNUSED) {}
+#endif
 
 static ullong startTime = 0;