From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 13 Jan 2015 06:24:04 +0000 (+0300)
Subject: build: fix build if siginfo_t lacks si_timerid/si_overrun
X-Git-Tag: v4.10~202
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36ab3d520ba43179cc24ccfa8a5b1bb422489793;p=strace

build: fix build if siginfo_t lacks si_timerid/si_overrun

* configure.ac (AC_CHECK_MEMBERS): Check for siginfo_t.si_timerid and
siginfo_t.si_overrun.
* signal.c (printsiginfo) [SI_TIMER]: Check HAVE_SIGINFO_T_SI_TIMERID
and HAVE_SIGINFO_T_SI_OVERRUN.
---

diff --git a/configure.ac b/configure.ac
index 66946704..34a62154 100644
--- a/configure.ac
+++ b/configure.ac
@@ -268,7 +268,9 @@ AC_CHECK_MEMBERS([struct utsname.domainname],,, [#include <sys/utsname.h>])
 
 AC_CHECK_MEMBERS([struct sigevent._sigev_un._pad,
 		  struct sigevent.__pad,
-		  siginfo_t.si_syscall],,, [#include <signal.h>])
+		  siginfo_t.si_syscall,
+		  siginfo_t.si_timerid,
+		  siginfo_t.si_overrun],,, [#include <signal.h>])
 
 AC_CHECK_MEMBERS([struct sysinfo.totalhigh,
 		  struct sysinfo.freehigh,
diff --git a/signal.c b/signal.c
index 6f00fc0e..a019905f 100644
--- a/signal.c
+++ b/signal.c
@@ -453,7 +453,8 @@ printsiginfo(siginfo_t *sip, int verbose)
 				printsigsource(sip);
 				break;
 #endif
-#ifdef SI_TIMER
+#if defined SI_TIMER \
+ && defined HAVE_SIGINFO_T_SI_TIMERID && defined HAVE_SIGINFO_T_SI_OVERRUN
 			case SI_TIMER:
 				tprintf(", si_timerid=%#x, si_overrun=%d",
 					sip->si_timerid, sip->si_overrun);