---
- branch: MAIN
  date: Tue Mar 12 11:39:49 UTC 2013
  files:
  - new: '1.21'
    old: '1.20'
    path: pkgsrc/x11/libXi/Makefile
    pathrev: pkgsrc/x11/libXi/Makefile@1.21
    type: modified
  - new: '1.18'
    old: '1.17'
    path: pkgsrc/x11/libXi/distinfo
    pathrev: pkgsrc/x11/libXi/distinfo@1.18
    type: modified
  - new: '1.1'
    old: '0'
    path: pkgsrc/x11/libXi/patches/patch-include_X11_extensions_XInput2.h
    pathrev: pkgsrc/x11/libXi/patches/patch-include_X11_extensions_XInput2.h@1.1
    type: added
  id: 20130312T113949Z.a0a99eae346e48ec9f56a778619fbaa74112ca40
  log: |
    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>
    ---
    Nasty, but can't think of a better way atm.
  module: pkgsrc
  subject: 'CVS commit: pkgsrc/x11/libXi'
  unixtime: '1363088389'
  user: wiz