From: rrt <unknown>
Date: Tue, 21 Mar 2000 11:33:12 +0000 (+0000)
Subject: [project @ 2000-03-21 11:33:12 by rrt]
X-Git-Tag: Approximately_9120_patches~4940
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=d443a744c91f8344b72583573b9135bf185ab86a;p=ghc-hetmet.git

[project @ 2000-03-21 11:33:12 by rrt]
Made them build on mingw32 again (problems with getourtimeofday, which
shouldn't be needed under mingw anyway).
---

diff --git a/ghc/rts/Itimer.c b/ghc/rts/Itimer.c
index cb7df62..73794f4 100644
--- a/ghc/rts/Itimer.c
+++ b/ghc/rts/Itimer.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Itimer.c,v 1.11 2000/03/20 09:42:49 andy Exp $
+ * $Id: Itimer.c,v 1.12 2000/03/21 11:33:12 rrt Exp $
  *
  * (c) The GHC Team, 1995-1999
  *
@@ -239,6 +239,7 @@ unblock_vtalrm_signal(void)
 }
 #endif
 
+#if !defined(HAVE_SETITIMER) && !defined(mingw32_TARGET_OS)
 unsigned int 
 getourtimeofday(void)
 {
@@ -246,3 +247,4 @@ getourtimeofday(void)
   gettimeofday(&tv, (struct timezone *) NULL);
   return (tv.tv_sec * 1000000 + tv.tv_usec);
 }
+#endif
diff --git a/ghc/rts/PrimOps.hc b/ghc/rts/PrimOps.hc
index 0d9caef..94dc251 100644
--- a/ghc/rts/PrimOps.hc
+++ b/ghc/rts/PrimOps.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: PrimOps.hc,v 1.48 2000/03/20 15:49:56 panne Exp $
+ * $Id: PrimOps.hc,v 1.49 2000/03/21 11:33:12 rrt Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -1017,7 +1017,7 @@ FN_(delayzh_fast)
     /* Add on ticks_since_select, since these will be subtracted at
      * the next awaitEvent call.
      */
-#if defined(HAVE_SETITIMER)
+#if defined(HAVE_SETITIMER) || defined(mingw32_TARGET_OS)
     CurrentTSO->block_info.delay = R1.i + ticks_since_select;
 #else
     CurrentTSO->block_info.target = R1.i + getourtimeofday();