diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-03-26 14:46:06 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-04-05 09:24:17 +1000 |
| commit | 0358bb20384b759d6d41dc44f3aed30583689d53 (patch) | |
| tree | 8a753b7060d73b28a9c624d22f7666c0cc24e32f /include/X11/extensions/XInput2.h | |
| parent | 081e06492c0ffd003d4a0c34418c882332e58ac3 (diff) | |
Require XFixes for PointerBarrier, remove duplicate typedef
The PointerBarrier typedef is duplicate if a client includes both Xfixes.h
and XInput2.h.
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
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Diffstat (limited to 'include/X11/extensions/XInput2.h')
| -rw-r--r-- | include/X11/extensions/XInput2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h index a746012..33670eb 100644 --- a/include/X11/extensions/XInput2.h +++ b/include/X11/extensions/XInput2.h @@ -30,6 +30,7 @@ #include <X11/Xlib.h> #include <X11/extensions/XI2.h> #include <X11/extensions/Xge.h> +#include <X11/extensions/Xfixes.h> /* PointerBarrier */ /******************************************************************* * @@ -169,7 +170,6 @@ typedef struct int status; } XIGrabModifiers; -typedef XID PointerBarrier; typedef unsigned int BarrierEventID; typedef struct |