[project @ 2003-03-29 00:00:41 by sof]

win32 tidyup: exclude Select.c, Itimer.c and Signals.c from SRCS

diff --git a/ghc/rts/Itimer.c b/ghc/rts/Itimer.c
index 8dee12c..4c94232 100644 (file)
--- a/ghc/rts/Itimer.c
+++ b/ghc/rts/Itimer.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Itimer.c,v 1.33 2003/03/28 23:46:39 sof Exp $
+ * $Id: Itimer.c,v 1.34 2003/03/29 00:00:41 sof Exp $
  *
  * (c) The GHC Team, 1995-1999
  *
@@ -18,7 +18,6 @@
  * to support.  So much for standards.
  */
 #include "Rts.h"
-#if !defined(mingw32_TARGET_OS) /* to the end */
 #include "RtsFlags.h"
 #include "Timer.h"
 #include "Itimer.h"
@@ -173,4 +172,3 @@ getourtimeofday(void)
          tv.tv_usec * TICK_FREQUENCY / 1000000);
 }
 
-#endif /* !mingw32_TARGET_OS */

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index ee75fee..cedfd45 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -38,6 +38,7 @@ ALL_DIRS = hooks parallel
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 ALL_DIRS += win32
+EXCLUDED_SRCS += Itimer.c Select.c Signals.c
 endif
 
 ifneq "$(DLLized)" "YES"

diff --git a/ghc/rts/Select.c b/ghc/rts/Select.c
index 73aad1a..da0e124 100644 (file)
--- a/ghc/rts/Select.c
+++ b/ghc/rts/Select.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Select.c,v 1.26 2003/02/22 06:13:41 sof Exp $
+ * $Id: Select.c,v 1.27 2003/03/29 00:00:41 sof Exp $
  *
  * (c) The GHC Team 1995-2002
  *
@@ -12,9 +12,6 @@
 /* #include "PosixSource.h" */
 
 #include "Rts.h"
-#ifndef mingw32_TARGET_OS
-/* to the end */
-
 #include "Schedule.h"
 #include "RtsUtils.h"
 #include "RtsFlags.h"
@@ -349,5 +346,3 @@ wakeBlockedWorkerThread()
     }
 }
 #endif
-
-#endif /* !mingw_TARGET_OS */

diff --git a/ghc/rts/Signals.c b/ghc/rts/Signals.c
index 355cf14..9c767d4 100644 (file)
--- a/ghc/rts/Signals.c
+++ b/ghc/rts/Signals.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Signals.c,v 1.35 2003/03/25 17:15:07 sof Exp $
+ * $Id: Signals.c,v 1.36 2003/03/29 00:00:41 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -32,8 +32,6 @@
 
 #include <stdlib.h>
 
-#ifndef mingw32_TARGET_OS
-
 #ifndef PAR
 
 /* SUP: The type of handlers is a little bit, well, doubtful... */
@@ -469,18 +467,3 @@ initDefaultHandlers()
     ieee_set_fp_control(0);
 #endif
 }
-#else /* mingw32_TARGET_OS */
-
-// Handle all signals in the current thread.
-// Called from Capability.c whenever the main capability is granted to a thread
-// and in installDefaultHandlers
-void
-handleSignalsInThisThread()
-{
-#ifdef RTS_SUPPORTS_THREADS
-#error "handleSignalsInThread needs to be sorted out for MinGW32"
-  /*    signalHandlingThread = pthread_self();*/
-#endif
-}
-
-#endif /* mingw32_TARGET_OS */

diff --git a/ghc/rts/Signals.h b/ghc/rts/Signals.h
index 4db8086..cddb4ba 100644 (file)
--- a/ghc/rts/Signals.h
+++ b/ghc/rts/Signals.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Signals.h,v 1.9 2003/01/25 15:54:50 wolfgang Exp $
+ * $Id: Signals.h,v 1.10 2003/03/29 00:00:43 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -27,7 +27,11 @@ extern void startSignalHandlers(void);
 extern void markSignalHandlers (evac_fn evac);
 extern void initDefaultHandlers(void);
 
+#if !defined(mingw32_TARGET_OS)
 extern void handleSignalsInThisThread(void);
+#else
+#define handleSignalsInThisThread() /* nothing */
+#endif
 
 #else
 

diff --git a/ghc/rts/Timer.c b/ghc/rts/Timer.c
index 1f9db85..5425116 100644 (file)
--- a/ghc/rts/Timer.c
+++ b/ghc/rts/Timer.c
@@ -20,7 +20,7 @@
 #include "Schedule.h"
 #include "Timer.h"
 
-#ifndef mingw32_TARGET_OS
+#if !defined(mingw32_TARGET_OS)
 #include "Itimer.h"
 #else
 #include "win32/Ticker.h"