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>

diff --git a/ChangeLog b/ChangeLog
index 43139c61393f07eda11d6df90931865f8e5c3c09..1984691a78855b19820271cf93abfefec9d825c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64
index e947cb190b75f0f6d812461aaabe45f3017f67b6..f86b79640caacbe42c056b4f7f2bcd2488f0c9b7 100644 (file)
--- a/ports/ChangeLog.aarch64
+++ b/ports/ChangeLog.aarch64
@@ -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.

diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index 143e01503528954cb78cb2d4f67a0060e3e8f00b..a9d5039745950bed4c1a11ca19ad8a5d2459f029 100644 (file)
--- a/ports/ChangeLog.ia64
+++ b/ports/ChangeLog.ia64
@@ -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.

diff --git a/ports/ChangeLog.tile b/ports/ChangeLog.tile
index a0ec89cac395e1520381250afcbcf843a01b4c9f..bf871234b2a0a2a66c0499c74d2c358217302f43 100644 (file)
--- a/ports/ChangeLog.tile
+++ b/ports/ChangeLog.tile
@@ -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 ...

diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h b/ports/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
index c8aff0eaadc41e8480913bc2154817db17121ec7..ca57bb50e51393e00ae914113b2d937d810a776c 100644 (file)
--- 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 0ea6d4024cd94c0dde992a5a8b2a93fe1ee50864..801a549ecab5f23e01b6e361691f318918fa8d9e 100644 (file)
--- 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 2a5246968fd412a893e289c04206fa4b7ca55d43..be31308dd39b3b5bba24fa44ecbcdf542a7ab072 100644 (file)
--- 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 d798b5a27baceaf1dc65d3b51158a46af695d991..dd81efc2815cfb9a0111dc74eafb2f7a0a6a0735 100644 (file)
--- 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 d86188e5f319c854bc3cea103909f210d202feaa..741dce6f9f382a3d074a705722df12efd6fa3e0d 100644 (file)
--- 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 2395c310a1a02c32cdff27ba2dc0916716801eb9..0f6c2ccae79189e94f00ef7f0c9d8bfc5e9f9789 100644 (file)
--- 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 ddcefba6385139bb401188543e6785fed656d4f2..e800562e81f622e1b28537cc321744605043eba3 100644 (file)
--- 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.  */