diff options
| author | Mark Wielaard <[email protected]> | 2018-02-15 14:44:18 +0100 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2018-02-15 14:55:39 +0100 |
| commit | 4482d0009a99b1773f2426479b666b08f57af9d5 (patch) | |
| tree | 675c48a48a3156da1d2f7c9a0db46c985691e73f /tests | |
| parent | 212b4e3d431449056aed316331ee654611671513 (diff) | |
Include sys/ptrace.h as early as possible.
On some systems, at least on Fedora 27 ppc64le with glibc 2.26-24 and
kernel 4.14.18-300, including sys/ptrace.h late (after signal.h or
sys/wait.h for example) will cause issues and produce errors like:
In file included from /usr/include/asm/sigcontext.h:12:0,
from /usr/include/bits/sigcontext.h:30,
from /usr/include/signal.h:287,
from /usr/include/sys/wait.h:36,
from linux-pid-attach.c:38:
/usr/include/sys/ptrace.h:73:3: error: expected identifier before numeric constant
PTRACE_GETREGS = 12,
^
Swapping the include order fixes these issues.
Signed-off-by: Mark Wielaard <[email protected]>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 6 | ||||
| -rw-r--r-- | tests/backtrace-child.c | 2 | ||||
| -rw-r--r-- | tests/backtrace-dwarf.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index eb4576ca..cfdd7f90 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2018-02-15 Mark Wielaard <[email protected]> + + * backtrace-child.c: Include signal.h after sys/ptrace.h. + * backtrace-dwarf.c: Include sys/wait.h and signal.h after + sys/ptrace.h. + 2018-01-25 Mark Wielaard <[email protected]> * Makefile.am (check_PROGRAMS): Add dwarf-die-addr-die. diff --git a/tests/backtrace-child.c b/tests/backtrace-child.c index 2c27414f..9c6ba94f 100644 --- a/tests/backtrace-child.c +++ b/tests/backtrace-child.c @@ -81,7 +81,6 @@ #include <config.h> #include <assert.h> #include <stdlib.h> -#include <signal.h> #include <errno.h> #include <string.h> #include <pthread.h> @@ -100,6 +99,7 @@ main (int argc __attribute__ ((unused)), char **argv) #else /* __linux__ */ #include <sys/ptrace.h> +#include <signal.h> #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) #define NOINLINE_NOCLONE __attribute__ ((noinline, noclone)) diff --git a/tests/backtrace-dwarf.c b/tests/backtrace-dwarf.c index 2dc8a9a2..7ff826cd 100644 --- a/tests/backtrace-dwarf.c +++ b/tests/backtrace-dwarf.c @@ -17,7 +17,6 @@ #include <config.h> #include <assert.h> -#include <signal.h> #include <inttypes.h> #include <stdio_ext.h> #include <locale.h> @@ -25,7 +24,6 @@ #include <error.h> #include <unistd.h> #include <sys/types.h> -#include <sys/wait.h> #include ELFUTILS_HEADER(dwfl) #ifndef __linux__ @@ -40,6 +38,8 @@ main (int argc __attribute__ ((unused)), char **argv) #else /* __linux__ */ #include <sys/ptrace.h> +#include <sys/wait.h> +#include <signal.h> #define main cleanup_13_main #include "cleanup-13.c" |