From: dons <unknown>
Date: Sun, 3 Oct 2004 02:04:29 +0000 (+0000)
Subject: [project @ 2004-10-03 02:04:29 by dons]
X-Git-Tag: Initial_conversion_from_CVS_complete~1545
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=c61f8941450284c3f33b6bd396204b2025a6f47e;p=ghc-hetmet.git

[project @ 2004-10-03 02:04:29 by dons]
Make sure genericRaise symbol is defined on all platforms, so Linker.c
won't complain, even if they don't actually use it.
---

diff --git a/ghc/rts/RtsUtils.c b/ghc/rts/RtsUtils.c
index f4d61b1..76eb7d1 100644
--- a/ghc/rts/RtsUtils.c
+++ b/ghc/rts/RtsUtils.c
@@ -304,12 +304,10 @@ heapCheckFail( void )
  * when we have a threaded rts. So System.Posix.Signals will call
  * genericRaise(), rather than raise(3).
  */
-#if defined(openbsd_TARGET_OS)
 int genericRaise(int sig) {
-# if defined(THREADED_RTS)
+#if defined(THREADED_RTS) && defined(openbsd_TARGET_OS)
         return pthread_kill(pthread_self(), sig);
-# else
+#else
         return raise(sig);
-# endif
-}
 #endif
+}
diff --git a/ghc/rts/RtsUtils.h b/ghc/rts/RtsUtils.h
index 3ee5971..4b0678d 100644
--- a/ghc/rts/RtsUtils.h
+++ b/ghc/rts/RtsUtils.h
@@ -50,8 +50,6 @@ extern void heapCheckFail( void );
 extern void* __hscore_get_saved_termios(int fd);
 extern void __hscore_set_saved_termios(int fd, void* ts);
 
-#if defined(openbsd_TARGET_OS)
 extern int genericRaise(int sig);
-#endif
 
 #endif // RTSUTILS_H