Commit fc0daeba750119b2321cca8ab73a64eeaa6773fa

Ryan C. Gordon 2014-03-02T01:59:25

Fixed X11 XInput2 multitouch test to work in configure script. configure wraps this C code in a main() function, so you can't declare a function body in there. Besides, I'm not sure why we declared a function that's part of the multitouch API anyhow. Now we just reference a type that only exists if the headers have multitouch support and call it a day.

diff --git a/configure b/configure
index 0d00f63..42d781f 100755
--- a/configure
+++ b/configure
@@ -20173,11 +20173,6 @@ main ()
 
 int event_type = XI_TouchBegin;
 XITouchClassInfo *t;
-Status
-XIAllowTouchEvents(Display *a,int b,unsigned int c,Window d,int f)
-{
-    return (Status)0;
-}
 
   ;
   return 0;
diff --git a/configure.in b/configure.in
index 98edcf8..f0bfd6f 100644
--- a/configure.in
+++ b/configure.in
@@ -1555,11 +1555,6 @@ AC_HELP_STRING([--enable-video-x11-xinput], [enable X11 XInput extension for man
             	],[
 int event_type = XI_TouchBegin;
 XITouchClassInfo *t;
-Status 
-XIAllowTouchEvents(Display *a,int b,unsigned int c,Window d,int f)
-{
-    return (Status)0;
-}
             	],[
             	have_xinput2_multitouch=yes
             	AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH)