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.
This commit is contained in:
Дмитрий Левин 2015-07-17 23:56:54 +00:00
parent 1e08a160f7
commit 0e946ab2c2
9 changed files with 14 additions and 2 deletions

View File

@ -79,6 +79,7 @@ strace_SOURCES = \
printmode.c \
printrusage.c \
printsiginfo.c \
printsiginfo.h \
printstat.h \
process.c \
process_vm.c \

2
defs.h
View File

@ -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 *);

View File

@ -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"

1
printsiginfo.h Normal file
View File

@ -0,0 +1 @@
extern void printsiginfo(const siginfo_t *, bool);

View File

@ -1,4 +1,7 @@
#include "defs.h"
#include <signal.h>
#include "xlat/sigaltstack_flags.h"
static void

View File

@ -32,6 +32,7 @@
*/
#include "defs.h"
#include <signal.h>
#ifndef NSIG
# warning NSIG is not defined, using 32

View File

@ -1,4 +1,5 @@
#include "defs.h"
#include <signal.h>
#include "regs.h"
#include "ptrace.h"

View File

@ -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;

1
time.c
View File

@ -29,6 +29,7 @@
#include "defs.h"
#include <fcntl.h>
#include <signal.h>
#include <linux/version.h>
#include <sys/timex.h>