CVS commit: pkgsrc/x11/libXi

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Mar 12 11:39:49 UTC 2013

Modified Files:
        pkgsrc/x11/libXi: Makefile distinfo
Added Files:
        pkgsrc/x11/libXi/patches: patch-include_X11_extensions_XInput2.h

Log Message:
redefinition of PointerBarrier.

gcc 4.6 won't complain about that, but earlier versions do:
http://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=ce3765bf44e49ef0568a1ad4a0b7f807591d6412

gcc 4.6 with -pedantic-errors shows:
/opt/xorg/include/X11/extensions/XInput2.h:172:13: error: redefinition of
typedef ‘PointerBarrier’ [-pedantic]
In file included from test.c:1:0:
/opt/xorg/include/X11/extensions/Xfixes.h:255:13: note: previous declaration
of ‘PointerBarrier’ was here

PointerBarriers is defined in XFixes.h and here. So hook onto the only thing
we can in Xfixes.h and use that to figure out if we need to typedef
ourselves. XFIXES_MAJOR is defined in xfixeswire.h, so we can't hook onto it
directly.

Adding this ifdef here means we have include order dependency of XFixes.h
before XInput2.h unless we add a similar ifdef to the fixes headers.

Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
---
Nasty, but can't think of a better way atm.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/libXi/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/libXi/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/libXi/patches/patch-include_X11_extensions_XInput2.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.