3 files changed, 3 insertions, 29 deletions
diff --git a/libgfortran/runtime/backtrace.c b/libgfortran/runtime/backtrace.c
index 606dd34..e28bdcb 100644
--- a/libgfortran/runtime/backtrace.c
+++ b/libgfortran/runtime/backtrace.c
@@ -25,6 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #include "libgfortran.h"
 
 #include <string.h>
+#include <stdlib.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/libgfortran/runtime/compile_options.c b/libgfortran/runtime/compile_options.c
index c3e64de..0c139a2 100644
--- a/libgfortran/runtime/compile_options.c
+++ b/libgfortran/runtime/compile_options.c
@@ -1,5 +1,5 @@
 /* Handling of compile-time options that influence the library.
-   Copyright (C) 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 This file is part of the GNU Fortran runtime library (libgfortran).
 
@@ -23,10 +23,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 <http://www.gnu.org/licenses/>.  */
 
 #include "libgfortran.h"
-
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 
 
 /* Useful compile-time options will be stored in here.  */
@@ -94,32 +91,17 @@ set_options (int num, int options[])
 
   /* If backtrace is required, we set signal handlers on the POSIX
      2001 signals with core action.  */
-#if defined(HAVE_SIGNAL) && (defined(SIGQUIT) || defined(SIGILL) \
-			     || defined(SIGABRT) || defined(SIGFPE) \
-			     || defined(SIGSEGV) || defined(SIGBUS) \
-			     || defined(SIGSYS) || defined(SIGTRAP) \
-			     || defined(SIGXCPU) || defined(SIGXFSZ))
   if (compile_options.backtrace)
     {
 #if defined(SIGQUIT)
       signal (SIGQUIT, backtrace_handler);
 #endif
 
-#if defined(SIGILL)
+      /* The following 4 signals are defined by C89.  */
       signal (SIGILL, backtrace_handler);
-#endif
-
-#if defined(SIGABRT)
       signal (SIGABRT, backtrace_handler);
-#endif
-
-#if defined(SIGFPE)
       signal (SIGFPE, backtrace_handler);
-#endif
-
-#if defined(SIGSEGV)
       signal (SIGSEGV, backtrace_handler);
-#endif
 
 #if defined(SIGBUS)
       signal (SIGBUS, backtrace_handler);
@@ -143,8 +125,6 @@ set_options (int num, int options[])
 
       maybe_find_addr2line ();
     }
-#endif
-
 }
 
 
diff --git a/libgfortran/runtime/error.c b/libgfortran/runtime/error.c
index cb06429..7e523bc 100644
--- a/libgfortran/runtime/error.c
+++ b/libgfortran/runtime/error.c
@@ -28,18 +28,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #include <assert.h>
 #include <string.h>
 #include <errno.h>
-
-#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
@@ -172,9 +167,7 @@ sys_abort (void)
       || (options.backtrace == -1 && compile_options.backtrace == 1))
     {
       show_backtrace ();
-#if defined(HAVE_SIGNAL) && defined(SIGABRT)
       signal (SIGABRT, SIG_DFL);
-#endif
     }
 
   abort();