Re: [PATCH] ptrace.h: add __ prefix to ptrace_peeksiginfo_args

[Mike Frysinger <vapier at gentoo dot org>]

On Monday 06 January 2014 07:03:55 Allan McRae wrote:
> On 06/01/14 07:16, Andreas Jaeger wrote:
> > On 01/05/2014 10:10 PM, Mike Frysinger wrote:
> >> 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.
> > 
> > Thanks Mike, this looks fine,
> 
> Is is worth adding a comment (perhaps only in in
> sysdeps/unix/sysv/linux/sys/ptrace.h) to the effect that the prefix is
> added to avoid conflict with linux/ptrace.h as a reminder we need unify
> these headers later?

maybe.  ptrace updates aren't that frequent though, so we could just wait for 
the other sync work we discussed w/xattrs stuff.
-mike

Attachment: signature.asc
Description: This is a digitally signed message part.