mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
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>
This commit is contained in:
parent
4cff0293ef
commit
9341dde4d5
@ -1,3 +1,12 @@
|
||||
2014-01-06 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* sysdeps/unix/sysv/linux/sys/ptrace.h (ptrace_peeksiginfo_args):
|
||||
Rename to ...
|
||||
(__ptrace_peeksiginfo_args): ... this.
|
||||
* sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: Likewise.
|
||||
* sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Likewise.
|
||||
* sysdeps/unix/sysv/linux/sparc/sys/ptrace.h: Likewise.
|
||||
|
||||
2014-01-06 Allan McRae <allan@archlinux.org>
|
||||
|
||||
* inet/netinet/in.h: Fix typo in comment.
|
||||
|
@ -1,3 +1,9 @@
|
||||
2014-01-06 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h (ptrace_peeksiginfo_args):
|
||||
Rename to ...
|
||||
(__ptrace_peeksiginfo_args): ... this.
|
||||
|
||||
2014-01-01 Marcus Shawcroft <marcus.shawcroft@linaro.org>
|
||||
|
||||
* sysdeps/aarch64/libm-test-ulps: Regenerated.
|
||||
|
@ -1,3 +1,9 @@
|
||||
2014-01-06 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* sysdeps/unix/sysv/linux/ia64/sys/ptrace.h (ptrace_peeksiginfo_args):
|
||||
Rename to ...
|
||||
(__ptrace_peeksiginfo_args): ... this.
|
||||
|
||||
2014-01-04 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* sysdeps/ia64/dl-tls.h (GET_ADDR_ARGS): Add "tls_ia64_" prefix to vars.
|
||||
|
@ -1,3 +1,9 @@
|
||||
2014-01-06 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* sysdeps/unix/sysv/linux/tile/sys/ptrace.h (ptrace_peeksiginfo_args):
|
||||
Rename to ...
|
||||
(__ptrace_peeksiginfo_args): ... this.
|
||||
|
||||
2013-10-30 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* sysdeps/unix/sysv/linux/tile/configure.in: Moved to ...
|
||||
|
@ -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. */
|
||||
|
@ -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. */
|
||||
|
@ -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. */
|
||||
|
@ -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. */
|
||||
|
@ -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. */
|
||||
|
@ -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. */
|
||||
|
@ -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. */
|
||||
|
Loading…
Reference in New Issue
Block a user