Merge pull request #1 from FRRouting/master

Merging from upstream tree

1 files changed, 0 insertions, 4 deletions

diff --git a/lib/log.c b/lib/log.c
index c577239908..51a0ddd6b7 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -559,9 +559,7 @@ static void crash_write(struct fbuf *fb, char *msgstart)
 void zlog_signal(int signo, const char *action, void *siginfo_v,
 		 void *program_counter)
 {
-#ifdef SA_SIGINFO
 	siginfo_t *siginfo = siginfo_v;
-#endif
 	time_t now;
 	char buf[sizeof("DEFAULT: Received signal S at T (si_addr 0xP, PC 0xP); aborting...")
 		 + 100];
@@ -575,7 +573,6 @@ void zlog_signal(int signo, const char *action, void *siginfo_v,
 	msgstart = fb.pos;
 
 	bprintfrr(&fb, "Received signal %d at %lld", signo, (long long)now);
-#ifdef SA_SIGINFO
 	if (program_counter)
 		bprintfrr(&fb, " (si_addr 0x%tx, PC 0x%tx)",
 			  (ptrdiff_t)siginfo->si_addr,
@@ -583,7 +580,6 @@ void zlog_signal(int signo, const char *action, void *siginfo_v,
 	else
 		bprintfrr(&fb, " (si_addr 0x%tx)",
 			  (ptrdiff_t)siginfo->si_addr);
-#endif /* SA_SIGINFO */
 	bprintfrr(&fb, "; %s\n", action);
 
 	crash_write(&fb, msgstart);