[project @ 2000-07-17 15:15:40 by rrt]

Changed __MINGW32__ to mingw32_TARGET_OS to cope with latest mingwin.

diff --git a/ghc/rts/RtsUtils.c b/ghc/rts/RtsUtils.c
index c35d038..81e01a6 100644 (file)
--- a/ghc/rts/RtsUtils.c
+++ b/ghc/rts/RtsUtils.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsUtils.c,v 1.16 2000/05/24 11:01:07 simonmar Exp $
+ * $Id: RtsUtils.c,v 1.17 2000/07/17 15:15:40 rrt Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -218,7 +218,7 @@ resetNonBlockingFd(int fd)
 {
   long fd_flags;
 
-#if !defined(_WIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#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) {

diff --git a/ghc/rts/Schedule.c b/ghc/rts/Schedule.c
index 31abe88..05d44df 100644 (file)
--- a/ghc/rts/Schedule.c
+++ b/ghc/rts/Schedule.c
@@ -1,5 +1,5 @@
 /* ---------------------------------------------------------------------------
- * $Id: Schedule.c,v 1.72 2000/06/20 15:15:44 simonmar Exp $
+ * $Id: Schedule.c,v 1.73 2000/07/17 15:15:40 rrt Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -516,7 +516,7 @@ schedule( void )
     }
     
     /* check for signals each time around the scheduler */
-#ifndef __MINGW32__
+#ifndef mingw32_TARGET_OS
     if (signals_pending()) {
       start_signal_handlers();
     }

diff --git a/ghc/rts/Stats.c b/ghc/rts/Stats.c
index 547ca27..d621192 100644 (file)
--- a/ghc/rts/Stats.c
+++ b/ghc/rts/Stats.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stats.c,v 1.20 2000/01/12 15:15:18 simonmar Exp $
+ * $Id: Stats.c,v 1.21 2000/07/17 15:15:40 rrt Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #endif
 
-#ifndef __MINGW32__
+#ifndef mingw32_TARGET_OS
 # ifdef HAVE_SYS_TIMES_H
 #  include <sys/times.h>
 # endif
@@ -37,7 +37,7 @@
 # endif
 #endif
 
-#if ! irix_TARGET_OS && ! defined(__MINGW32__)
+#if ! irix_TARGET_OS && ! defined(mingw32_TARGET_OS)
 # if defined(HAVE_SYS_RESOURCE_H)
 #  include <sys/resource.h>
 # endif

diff --git a/ghc/rts/StgMiscClosures.hc b/ghc/rts/StgMiscClosures.hc
index b95cfd5..76ab898 100644 (file)
--- a/ghc/rts/StgMiscClosures.hc
+++ b/ghc/rts/StgMiscClosures.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgMiscClosures.hc,v 1.45 2000/06/25 17:25:42 panne Exp $
+ * $Id: StgMiscClosures.hc,v 1.46 2000/07/17 15:15:40 rrt Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #endif
 
-/* ToDo: make the printing of panics more Win32-friendly, i.e.,
+/* ToDo: make the printing of panics more win32-friendly, i.e.,
  *       pop up some lovely message boxes (as well).
  */
 #define DUMP_ERRMSG(msg) STGCALL2(fprintf,stderr,msg)