Skip to content

Commit 0e946ab

Browse files
committed
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.
1 parent 1e08a16 commit 0e946ab

File tree

9 files changed

+14
-2
lines changed

9 files changed

+14
-2
lines changed

Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ strace_SOURCES = \
7979
printmode.c \
8080
printrusage.c \
8181
printsiginfo.c \
82+
printsiginfo.h \
8283
printstat.h \
8384
process.c \
8485
process_vm.c \

defs.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
/* #include <ctype.h> */
5151
#include <string.h>
5252
#include <errno.h>
53-
#include <signal.h>
5453
#include <time.h>
5554
#include <sys/time.h>
5655
#include <sys/syscall.h>
@@ -564,7 +563,6 @@ extern void printtv_bitness(struct tcb *, long, enum bitness_t, int);
564563
extern char *sprinttv(char *, struct tcb *, long, enum bitness_t, int special);
565564
extern void print_timespec(struct tcb *, long);
566565
extern void sprint_timespec(char *, struct tcb *, long);
567-
extern void printsiginfo(const siginfo_t *, bool);
568566
extern void printsiginfo_at(struct tcb *tcp, long addr);
569567
extern void printfd(struct tcb *, int);
570568
extern bool print_sockaddr_by_inode(const unsigned long, const char *);

printsiginfo.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#include "defs.h"
22

3+
#include <signal.h>
4+
5+
#include "printsiginfo.h"
6+
37
#include "xlat/sigbus_codes.h"
48
#include "xlat/sigchld_codes.h"
59
#include "xlat/sigfpe_codes.h"

printsiginfo.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
extern void printsiginfo(const siginfo_t *, bool);

sigaltstack.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#include "defs.h"
2+
3+
#include <signal.h>
4+
25
#include "xlat/sigaltstack_flags.h"
36

47
static void

signal.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
*/
3333

3434
#include "defs.h"
35+
#include <signal.h>
3536

3637
#ifndef NSIG
3738
# warning NSIG is not defined, using 32

sigreturn.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "defs.h"
2+
#include <signal.h>
23
#include "regs.h"
34
#include "ptrace.h"
45

strace.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include <stdarg.h>
3333
#include <sys/param.h>
3434
#include <fcntl.h>
35+
#include <signal.h>
3536
#include <sys/resource.h>
3637
#include <sys/wait.h>
3738
#include <sys/stat.h>
@@ -44,6 +45,7 @@
4445
#endif
4546

4647
#include "ptrace.h"
48+
#include "printsiginfo.h"
4749

4850
/* In some libc, these aren't declared. Do it ourself: */
4951
extern char **environ;

time.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
#include "defs.h"
3131
#include <fcntl.h>
32+
#include <signal.h>
3233
#include <linux/version.h>
3334
#include <sys/timex.h>
3435

0 commit comments

Comments
 (0)