From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 11 Mar 2012 04:10:55 +0000 (-0500)
Subject: Drop unneeded XI2 defines
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=82041de9b5064c3b3867cde1639d90b8a0edc36f;hp=39964b944abac33d602c8d239ba110c672744c68;p=~andy%2Fgtk

Drop unneeded XI2 defines

The X headers don't use these defines anywhere.
---

diff --git a/configure.ac b/configure.ac
index 616ee7858..6e6453495 100644
--- a/configure.ac
+++ b/configure.ac
@@ -931,7 +931,7 @@ if test "x$enable_x11_backend" = xyes; then
     have_base_x_pc=true
     X_PACKAGES="$X_PACKAGES x11 xext"
     x_libs="`$PKG_CONFIG --libs x11 xext`"
-    X_CFLAGS="`$PKG_CONFIG --cflags x11 xext` -DXINPUT2_1_USE_UNSTABLE_PROTOCOL -DXINPUT2_2_USE_UNSTABLE_PROTOCOL"
+    X_CFLAGS="`$PKG_CONFIG --cflags x11 xext`"
 
     # Strip out any .la files that pkg-config might give us (this happens
     # with -uninstalled.pc files)
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 0b3f81e2e..185c967f9 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -7,8 +7,6 @@ libgdkx11includedir = $(includedir)/gtk-3.0/gdk/x11
 AM_CPPFLAGS = 			\
 	-DG_LOG_DOMAIN=\"Gdk\"	\
 	-DGDK_COMPILATION	\
-	-DXINPUT2_2_USE_UNSTABLE_PROTOCOL \
-	-DXINPUT2_1_USE_UNSTABLE_PROTOCOL \
 	-I$(top_srcdir)		\
 	-I$(top_srcdir)/gdk	\
 	-I$(top_builddir)/gdk	\