From 0358bb20384b759d6d41dc44f3aed30583689d53 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 26 Mar 2013 14:46:06 +1000 Subject: Require XFixes for PointerBarrier, remove duplicate typedef MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Julien Cristau --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ab8a63c..c2897d2 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,8 @@ XORG_CHECK_MALLOC_ZERO # Obtain compiler/linker options for dependencies PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 2.2.99.1]) +# CFLAGS only for PointerBarrier typedef +PKG_CHECK_MODULES(XFIXES, [xfixes >= 5]) # Check for xmlto and asciidoc for man page conversion # (only needed by people building tarballs) -- cgit v1.2.3