projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-08-13 13:04:50 by simonmar]
[ghc-hetmet.git]
/
ghc
/
rts
/
Signals.c
diff --git
a/ghc/rts/Signals.c
b/ghc/rts/Signals.c
index
4773006
..
4d76b11
100644
(file)
--- a/
ghc/rts/Signals.c
+++ b/
ghc/rts/Signals.c
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: Signals.c,v 1.37 2003/04/01 15:05:22 sof Exp $
+ * $Id: Signals.c,v 1.41 2004/08/13 13:10:44 simonmar Exp $
*
* (c) The GHC Team, 1998-1999
*
*
* (c) The GHC Team, 1998-1999
*
@@
-16,10
+16,13
@@
#include "Signals.h"
#include "RtsUtils.h"
#include "RtsFlags.h"
#include "Signals.h"
#include "RtsUtils.h"
#include "RtsFlags.h"
-#include "StablePriv.h"
#ifdef alpha_TARGET_ARCH
#ifdef alpha_TARGET_ARCH
-# include <machine/fpu.h>
+# if defined(linux_TARGET_OS)
+# include <asm/fpu.h>
+# else
+# include <machine/fpu.h>
+# endif
#endif
#ifdef HAVE_UNISTD_H
#endif
#ifdef HAVE_UNISTD_H
@@
-291,7
+294,7
@@
stg_sig_install(int sig, int spi, StgStablePtr *handler, void *mask)
}
return STG_SIG_ERR;
}
}
return STG_SIG_ERR;
}
-
+
if (previous_spi == STG_SIG_DFL || previous_spi == STG_SIG_IGN
|| previous_spi == STG_SIG_ERR) {
return previous_spi;
if (previous_spi == STG_SIG_DFL || previous_spi == STG_SIG_IGN
|| previous_spi == STG_SIG_ERR) {
return previous_spi;
@@
-436,7
+439,7
@@
initDefaultHandlers()
prog_belch("warning: failed to install SIGINT handler");
}
prog_belch("warning: failed to install SIGINT handler");
}
-#ifndef cygwin32_TARGET_OS
+#if defined(HAVE_SIGINTERRUPT)
siginterrupt(SIGINT, 1); // isn't this the default? --SDM
#endif
siginterrupt(SIGINT, 1); // isn't this the default? --SDM
#endif