diff options
| author | Michael Forney | 2013-10-03 11:39:18 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-10-04 11:51:34 +0200 |
| commit | b09bc5088bed5174f1ffa3d4a51cef1cdd37292f (patch) | |
| tree | ff29a6429b3609e261e1cc56a3388a200092b9bf | |
| parent | include: Add missing includes (diff) | |
| download | kernel-qcow2-util-linux-b09bc5088bed5174f1ffa3d4a51cef1cdd37292f.tar.gz kernel-qcow2-util-linux-b09bc5088bed5174f1ffa3d4a51cef1cdd37292f.tar.xz kernel-qcow2-util-linux-b09bc5088bed5174f1ffa3d4a51cef1cdd37292f.zip | |
build-sys: Check for type sighandler_t and use if present
__sighandler_t is libc implementation specific and should not be relied
upon. Instead, we fall back upon void (*)(int), as specified by POSIX.
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | fdisks/cfdisk.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 12d0babf7..93572fe8a 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 5007fc99e..bb324338a 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; |