diff options
author | Mike Frysinger <vapier@gentoo.org> | 2014-01-05 16:07:13 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2014-01-06 08:26:31 -0500 |
commit | 367416b057d5da2f719856c8ee9072b58600f48d (patch) | |
tree | 8f7bc8326a4dfde732a7a4848f752e157d20630f | |
parent | d1b29e58c17436b3e0cf92c12b1e99ec6b4cd9ba (diff) | |
download | glibc-367416b057d5da2f719856c8ee9072b58600f48d.zip glibc-367416b057d5da2f719856c8ee9072b58600f48d.tar.gz glibc-367416b057d5da2f719856c8ee9072b58600f48d.tar.bz2 |
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 <vapier@gentoo.org>
-rw-r--r-- | ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h | 2 | ||||
-rw-r--r-- | ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h | 2 | ||||
-rw-r--r-- | ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/sys/ptrace.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sys/ptrace.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sys/ptrace.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h b/ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h index 71e1dec..7b5f6e4 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 d6f3908..cda5209 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 32e47c7..3c8aea2 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. */ diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h index 2104a2d..e680444 100644 --- a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h @@ -158,7 +158,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/sysdeps/unix/sysv/linux/s390/sys/ptrace.h b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h index e7f7b22..932a331 100644 --- a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h @@ -197,7 +197,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/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h index 7543fa7..0efec6e 100644 --- a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h @@ -240,7 +240,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/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h index 2b78565..58f50c5 100644 --- a/sysdeps/unix/sysv/linux/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/sys/ptrace.h @@ -188,7 +188,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. */ |