From 9341dde4d56ca71b61b47c8b87a06e6d5813ed0e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 5 Jan 2014 16:07:13 -0500 Subject: ptrace.h: add __ prefix to ptrace_peeksiginfo_args All the other ptrace structures in this file have a __ prefix except this new one. This in turn causes build problems for most packages that try to use ptrace such as strace: gcc -DHAVE_CONFIG_H -I. -I../.. -I../../linux/x86_64 -I../../linux \ -I./linux -Wall -Wwrite-strings -g -O2 -MT process.o -MD -MP \ -MF .deps/process.Tpo -c -o process.o ../../process.c In file included from ../../process.c:63:0: /usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args' struct ptrace_peeksiginfo_args { ^ In file included from ../../defs.h:159:0, from ../../process.c:37: /usr/include/sys/ptrace.h:191:8: note: originally defined here struct ptrace_peeksiginfo_args ^ Since this struct was introduced in glibc-2.18, there shouldn't be any real regressions with adding the __ prefix. Signed-off-by: Mike Frysinger --- ports/ChangeLog.aarch64 | 6 ++++++ ports/ChangeLog.ia64 | 6 ++++++ ports/ChangeLog.tile | 6 ++++++ ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h | 2 +- ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h | 2 +- ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h | 2 +- 6 files changed, 21 insertions(+), 3 deletions(-) (limited to 'ports') diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64 index e947cb190b..f86b79640c 100644 --- a/ports/ChangeLog.aarch64 +++ b/ports/ChangeLog.aarch64 @@ -1,3 +1,9 @@ +2014-01-06 Mike Frysinger + + * sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h (ptrace_peeksiginfo_args): + Rename to ... + (__ptrace_peeksiginfo_args): ... this. + 2014-01-01 Marcus Shawcroft * sysdeps/aarch64/libm-test-ulps: Regenerated. diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64 index 143e015035..a9d5039745 100644 --- a/ports/ChangeLog.ia64 +++ b/ports/ChangeLog.ia64 @@ -1,3 +1,9 @@ +2014-01-06 Mike Frysinger + + * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h (ptrace_peeksiginfo_args): + Rename to ... + (__ptrace_peeksiginfo_args): ... this. + 2014-01-04 Mike Frysinger * sysdeps/ia64/dl-tls.h (GET_ADDR_ARGS): Add "tls_ia64_" prefix to vars. diff --git a/ports/ChangeLog.tile b/ports/ChangeLog.tile index a0ec89cac3..bf871234b2 100644 --- a/ports/ChangeLog.tile +++ b/ports/ChangeLog.tile @@ -1,3 +1,9 @@ +2014-01-06 Mike Frysinger + + * sysdeps/unix/sysv/linux/tile/sys/ptrace.h (ptrace_peeksiginfo_args): + Rename to ... + (__ptrace_peeksiginfo_args): ... this. + 2013-10-30 Mike Frysinger * sysdeps/unix/sysv/linux/tile/configure.in: Moved to ... diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h b/ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h index c8aff0eaad..ca57bb50e5 100644 --- a/ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h +++ b/ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h @@ -165,7 +165,7 @@ enum __ptrace_eventcodes }; /* Arguments for PTRACE_PEEKSIGINFO. */ -struct ptrace_peeksiginfo_args +struct __ptrace_peeksiginfo_args { __uint64_t off; /* From which siginfo to start. */ __uint32_t flags; /* Flags for peeksiginfo. */ diff --git a/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h b/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h index 0ea6d4024c..801a549eca 100644 --- a/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h +++ b/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h @@ -185,7 +185,7 @@ enum __ptrace_eventcodes }; /* Arguments for PTRACE_PEEKSIGINFO. */ -struct ptrace_peeksiginfo_args +struct __ptrace_peeksiginfo_args { __uint64_t off; /* From which siginfo to start. */ __uint32_t flags; /* Flags for peeksiginfo. */ diff --git a/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h b/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h index 2a5246968f..be31308dd3 100644 --- a/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h +++ b/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h @@ -154,7 +154,7 @@ enum __ptrace_eventcodes }; /* Arguments for PTRACE_PEEKSIGINFO. */ -struct ptrace_peeksiginfo_args +struct __ptrace_peeksiginfo_args { __uint64_t off; /* From which siginfo to start. */ __uint32_t flags; /* Flags for peeksiginfo. */ -- cgit 1.4.1