[PATCH 3/4] Check for type sighandler_t and use if present

Michael Forney
2013-10-03T09:39:30Z

__sighandler_t is libc implementation specific and should not be relied
upon. Instead, we fall back upon void (*)(int), as specified by POSIX.
---
configure.ac | 4 ++++
fdisks/cfdisk.c | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 12d0bab..93572fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -497,6 +497,10 @@ AC_CHECK_TYPES([cpu_set_t], [have_cpu_set_t=yes], [], [[

AM_CONDITIONAL([HAVE_CPU_SET_T], [test "x$have_cpu_set_t" = xyes])

+AC_CHECK_TYPES([sighandler_t], [], [], [[
+#include <signal.h>
+]])
+
AC_CHECK_DECLS([CPU_ALLOC], [], [], [[
#include <sched.h>
]])
diff --git a/fdisks/cfdisk.c b/fdisks/cfdisk.c
index 5007fc9..bb32433 100644
--- a/fdisks/cfdisk.c
+++ b/fdisks/cfdisk.c
@@ -324,7 +324,11 @@ int num_parts = 0;
int logical = 0;
long long logical_sectors[MAXIMUM_PARTS];

-__sighandler_t old_SIGINT, old_SIGTERM;
+#ifdef HAVE_SIGHANDLER_T
+sighandler_t old_SIGINT, old_SIGTERM;
+#else
+void (* old_SIGINT)(int), (* old_SIGTERM)(int);
+#endif

int arrow_cursor = FALSE;
int display_units = MEGABYTES;
--
1.8.4