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.

diff --git a/Makefile.am b/Makefile.am
index ed5b625c26789220a2ba92d82eead2879144d817..95672bd80b864313b411b11818f89a6a5c2f6add 100644 (file)
--- 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 25e377aa3125f2dd0cf9ff3dce790c22814ccfad..9302cb7a7100e810d83831df21f6938963e4f649 100644 (file)
--- 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 282f25dd2ec29fd528ee22682516764a42c026a2..e592854c5e55b25ef9da415ed42b73715b1938d4 100644 (file)
--- 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 (file)
index 0000000..b36b3d6
--- /dev/null
+++ b/printsiginfo.h
@@ -0,0 +1 @@
+extern void printsiginfo(const siginfo_t *, bool);

diff --git a/sigaltstack.c b/sigaltstack.c
index f59643d5bff190fd676c80ba44b6c6fc139f0691..1a4a2295fd34c7d5c47796e3aa614b06690092a2 100644 (file)
--- 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 814c9f09e41afc068f753577e5bc631ffa633220..e0f2a70baee34f17e07368846d62fe1f7b89b091 100644 (file)
--- 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 3909d1d1b0dcc0a15515458d699194c5e868e243..659d5af9ef353c603b2efce92455adfc87b93e4f 100644 (file)
--- 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 f6b0b86aeaf5d526eddbf9e9615ae94bc9b768ea..9b93e7968dbb632294328a4abdf6acb867d4529a 100644 (file)
--- 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 dbe618934da1d89da7dbb63fcb26beb0c4ff48c1..a373641fab8b55caa3d8afa46302db7de9004921 100644 (file)
--- 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>