aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar axel <axel@liljencrantz.se>2006-07-31 06:26:59 +1000
committerGravatar axel <axel@liljencrantz.se>2006-07-31 06:26:59 +1000
commit60f05338216ecd819fe9889124b4d40049d830cb (patch)
treee846db29631918ad78a112ed386b4e5b1c701439
parent0768cf7e537d303c4601fb271f90a3caf87e52d7 (diff)
Include siginfo.h in all signal-using files to make Solaris happy. Thanks to Netocrat for the report and a description of the solution.
darcs-hash:20060730202659-ac50b-1840aff40ec2467242bd107676c7426cdb14f643.gz
-rw-r--r--common.c4
-rw-r--r--configure.ac2
-rw-r--r--exec.c4
-rw-r--r--proc.c3
-rw-r--r--reader.c4
-rw-r--r--signal.c4
6 files changed, 20 insertions, 1 deletions
diff --git a/common.c b/common.c
index 97b9b7a6..cd732344 100644
--- a/common.c
+++ b/common.c
@@ -13,6 +13,10 @@ parts of fish.
#include <stropts.h>
#endif
+#ifdef HAVE_SIGINFO_H
+#include <siginfo.h>
+#endif
+
#include <stdlib.h>
#include <termios.h>
#include <wchar.h>
diff --git a/configure.ac b/configure.ac
index 73b75138..e4ce5d35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,7 +250,7 @@ AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, need
AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
# Check for presense of various header files
-AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h term.h ncurses/term.h libintl.h ncurses.h curses.h stropts.h])
+AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h term.h ncurses/term.h libintl.h ncurses.h curses.h stropts.h siginfo.h])
AC_CHECK_HEADER([regex.h],
[AC_DEFINE([HAVE_REGEX_H], [1], [Define to 1 if you have the <regex.h> header file.])],
diff --git a/exec.c b/exec.c
index 17e3f9cd..9fda54d2 100644
--- a/exec.c
+++ b/exec.c
@@ -21,6 +21,10 @@
#include <assert.h>
#include <dirent.h>
+#ifdef HAVE_SIGINFO_H
+#include <siginfo.h>
+#endif
+
#include "config.h"
#include "fallback.h"
diff --git a/proc.c b/proc.c
index 4c5e50df..bf6cbfdf 100644
--- a/proc.c
+++ b/proc.c
@@ -42,6 +42,9 @@ Some of the code in this file is based on code from the Glibc manual.
#include <ncurses/term.h>
#endif
+#ifdef HAVE_SIGINFO_H
+#include <siginfo.h>
+#endif
#include "fallback.h"
#include "util.h"
diff --git a/reader.c b/reader.c
index bca8bf86..3a5b69c4 100644
--- a/reader.c
+++ b/reader.c
@@ -51,6 +51,10 @@ commence.
#include <ncurses/term.h>
#endif
+#ifdef HAVE_SIGINFO_H
+#include <siginfo.h>
+#endif
+
#include <signal.h>
#include <fcntl.h>
#include <dirent.h>
diff --git a/signal.c b/signal.c
index 1cd6e883..204ab2ee 100644
--- a/signal.c
+++ b/signal.c
@@ -15,6 +15,10 @@ The library for various signal related issues
#include <unistd.h>
#include <errno.h>
+#ifdef HAVE_SIGINFO_H
+#include <siginfo.h>
+#endif
+
#include "common.h"
#include "fallback.h"
#include "util.h"