From 0e946ab2c26f3cb6f27cb99ddf0f5581bef16781 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Fri, 17 Jul 2015 23:56:54 +0000
Subject: [PATCH] defs.h: do not include <signal.h>

* printsiginfo.h: New file.
* Makefile.am (strace_SOURCES): Add it.
* defs.h: Do not include <signal.h>.
(printsiginfo): Remove.
* printsiginfo.c: Include <signal.h> and "printsiginfo.h".
* strace.c: Likewise.
* sigaltstack.c: Include <signal.h>.
* signal.c: Likewise.
* sigreturn.c: Likewise.
* time.c: Likewise.
---
 Makefile.am    | 1 +
 defs.h         | 2 --
 printsiginfo.c | 4 ++++
 printsiginfo.h | 1 +
 sigaltstack.c  | 3 +++
 signal.c       | 1 +
 sigreturn.c    | 1 +
 strace.c       | 2 ++
 time.c         | 1 +
 9 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 printsiginfo.h

diff --git a/Makefile.am b/Makefile.am
index ed5b625c..95672bd8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,6 +79,7 @@ strace_SOURCES =	\
 	printmode.c	\
 	printrusage.c	\
 	printsiginfo.c	\
+	printsiginfo.h	\
 	printstat.h	\
 	process.c	\
 	process_vm.c	\
diff --git a/defs.h b/defs.h
index 25e377aa..9302cb7a 100644
--- a/defs.h
+++ b/defs.h
@@ -50,7 +50,6 @@
 /* #include <ctype.h> */
 #include <string.h>
 #include <errno.h>
-#include <signal.h>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/syscall.h>
@@ -564,7 +563,6 @@ extern void printtv_bitness(struct tcb *, long, enum bitness_t, int);
 extern char *sprinttv(char *, struct tcb *, long, enum bitness_t, int special);
 extern void print_timespec(struct tcb *, long);
 extern void sprint_timespec(char *, struct tcb *, long);
-extern void printsiginfo(const siginfo_t *, bool);
 extern void printsiginfo_at(struct tcb *tcp, long addr);
 extern void printfd(struct tcb *, int);
 extern bool print_sockaddr_by_inode(const unsigned long, const char *);
diff --git a/printsiginfo.c b/printsiginfo.c
index 282f25dd..e592854c 100644
--- a/printsiginfo.c
+++ b/printsiginfo.c
@@ -1,5 +1,9 @@
 #include "defs.h"
 
+#include <signal.h>
+
+#include "printsiginfo.h"
+
 #include "xlat/sigbus_codes.h"
 #include "xlat/sigchld_codes.h"
 #include "xlat/sigfpe_codes.h"
diff --git a/printsiginfo.h b/printsiginfo.h
new file mode 100644
index 00000000..b36b3d69
--- /dev/null
+++ b/printsiginfo.h
@@ -0,0 +1 @@
+extern void printsiginfo(const siginfo_t *, bool);
diff --git a/sigaltstack.c b/sigaltstack.c
index f59643d5..1a4a2295 100644
--- a/sigaltstack.c
+++ b/sigaltstack.c
@@ -1,4 +1,7 @@
 #include "defs.h"
+
+#include <signal.h>
+
 #include "xlat/sigaltstack_flags.h"
 
 static void
diff --git a/signal.c b/signal.c
index 814c9f09..e0f2a70b 100644
--- a/signal.c
+++ b/signal.c
@@ -32,6 +32,7 @@
  */
 
 #include "defs.h"
+#include <signal.h>
 
 #ifndef NSIG
 # warning NSIG is not defined, using 32
diff --git a/sigreturn.c b/sigreturn.c
index 3909d1d1..659d5af9 100644
--- a/sigreturn.c
+++ b/sigreturn.c
@@ -1,4 +1,5 @@
 #include "defs.h"
+#include <signal.h>
 #include "regs.h"
 #include "ptrace.h"
 
diff --git a/strace.c b/strace.c
index f6b0b86a..9b93e796 100644
--- a/strace.c
+++ b/strace.c
@@ -32,6 +32,7 @@
 #include <stdarg.h>
 #include <sys/param.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <sys/resource.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
@@ -44,6 +45,7 @@
 #endif
 
 #include "ptrace.h"
+#include "printsiginfo.h"
 
 /* In some libc, these aren't declared. Do it ourself: */
 extern char **environ;
diff --git a/time.c b/time.c
index dbe61893..a373641f 100644
--- a/time.c
+++ b/time.c
@@ -29,6 +29,7 @@
 
 #include "defs.h"
 #include <fcntl.h>
+#include <signal.h>
 #include <linux/version.h>
 #include <sys/timex.h>
 
-- 
2.40.0