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:07:33 -0500 |
| commit | 9341dde4d56ca71b61b47c8b87a06e6d5813ed0e (patch) | |
| tree | 4cca0dcb7c702987c9b16c4969a9dfafc45c5c94 /sysdeps | |
| parent | 4cff0293efa09d894084e090d3d9836f6db6bf36 (diff) | |
| download | glibc-9341dde4d56ca71b61b47c8b87a06e6d5813ed0e.zip glibc-9341dde4d56ca71b61b47c8b87a06e6d5813ed0e.tar.gz glibc-9341dde4d56ca71b61b47c8b87a06e6d5813ed0e.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>
Diffstat (limited to 'sysdeps')
| -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 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h index d798b5a..dd81efc 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 d86188e..741dce6 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 2395c31..0f6c2cc 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 ddcefba..e800562 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. */ |