From ad4d62e1d318c629f994883e3b9926627bec16f0 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Fri, 7 Apr 2006 17:30:27 +0000
Subject: Unlibcwrap. Bump server version requirement. Bump to 1.1.0.

---
 ChangeLog       | 11 +++++++++++
 configure.ac    |  4 ++--
 src/evdev.c     |  5 +----
 src/evdev.h     |  4 ++++
 src/evdev_abs.c |  6 ------
 src/evdev_btn.c |  6 ------
 src/evdev_key.c |  6 ------
 src/evdev_rel.c |  6 ------
 8 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ab9c7bc..d5e94c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-04-06  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	* src/evdev.c:
+	* src/evdev.h:
+	* src/evdev_abs.c:
+	* src/evdev_btn.c:
+	* src/evdev_key.c:
+	* src/evdev_rel.c:
+	Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
+
 2006-03-31  Zephaniah E. Hull  <warp@aehallh.com>
 
 	* src/evdev_brain.c: (FillDevInfo), (evdevRescanDevices):
diff --git a/configure.ac b/configure.ac
index 7e05d58..dee75a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-evdev],
-        1.0.0.5,
+        1.1.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-input-evdev)
 
@@ -76,7 +76,7 @@ XORG_DRIVER_CHECK_EXT(XKB, kbproto)
 XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
diff --git a/src/evdev.c b/src/evdev.c
index 3a2e397..ee35a26 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -63,9 +63,6 @@
 
 #include <string.h>
 
-/* The libc wrapper just blows... linux/input.h must be included
- * before xf86_ansic.h and xf86_libc.h so we avoid defining ioctl
- * twice. */
 #include "evdev.h"
 
 #include <xf86.h>
@@ -485,7 +482,7 @@ static XF86ModuleVersionInfo EvdevVersionRec =
     MODINFOSTRING1,
     MODINFOSTRING2,
     0, /* Missing from SDK: XORG_VERSION_CURRENT, */
-    1, 0, 0,
+    1, 1, 0,
     ABI_CLASS_XINPUT,
     ABI_XINPUT_VERSION,
     MOD_CLASS_XINPUT,
diff --git a/src/evdev.h b/src/evdev.h
index f31b160..797bc9f 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -63,6 +63,10 @@
 #include <linux/input.h>
 #include <xf86Xinput.h>
 #include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #define BITS_PER_LONG		(sizeof(long) * 8)
 #define NBITS(x)		((((x)-1)/BITS_PER_LONG)+1)
diff --git a/src/evdev_abs.c b/src/evdev_abs.c
index 90938d9..ded329a 100644
--- a/src/evdev_abs.c
+++ b/src/evdev_abs.c
@@ -37,18 +37,12 @@
 #include <X11/XF86keysym.h>
 #include <X11/extensions/XIproto.h>
 
-/* The libc wrapper just blows... linux/input.h must be included
- * before xf86_ansic.h and xf86_libc.h so we avoid defining ioctl
- * twice. */
-
 #include <linux/input.h>
 
 #include <misc.h>
 #include <xf86.h>
 #include <xf86str.h>
 #include <xf86_OSproc.h>
-#include <xf86_ansic.h>
-#include <xf86_libc.h>
 #include <xf86Xinput.h>
 #include <exevents.h>
 #include <mipointer.h>
diff --git a/src/evdev_btn.c b/src/evdev_btn.c
index 0bab4b4..a0e0dad 100644
--- a/src/evdev_btn.c
+++ b/src/evdev_btn.c
@@ -37,18 +37,12 @@
 #include <X11/XF86keysym.h>
 #include <X11/extensions/XIproto.h>
 
-/* The libc wrapper just blows... linux/input.h must be included
- * before xf86_ansic.h and xf86_libc.h so we avoid defining ioctl
- * twice. */
-
 #include <linux/input.h>
 
 #include <misc.h>
 #include <xf86.h>
 #include <xf86str.h>
 #include <xf86_OSproc.h>
-#include <xf86_ansic.h>
-#include <xf86_libc.h>
 #include <xf86Xinput.h>
 #include <exevents.h>
 #include <mipointer.h>
diff --git a/src/evdev_key.c b/src/evdev_key.c
index c98d336..74b383b 100644
--- a/src/evdev_key.c
+++ b/src/evdev_key.c
@@ -61,18 +61,12 @@
 #include <X11/XF86keysym.h>
 #include <X11/extensions/XIproto.h>
 
-/* The libc wrapper just blows... linux/input.h must be included
- * before xf86_ansic.h and xf86_libc.h so we avoid defining ioctl
- * twice. */
-
 #include <linux/input.h>
 
 #include <misc.h>
 #include <xf86.h>
 #include <xf86str.h>
 #include <xf86_OSproc.h>
-#include <xf86_ansic.h>
-#include <xf86_libc.h>
 #include <xf86Xinput.h>
 #include <exevents.h>
 #include <mipointer.h>
diff --git a/src/evdev_rel.c b/src/evdev_rel.c
index a6336f8..f6d6c75 100644
--- a/src/evdev_rel.c
+++ b/src/evdev_rel.c
@@ -37,18 +37,12 @@
 #include <X11/XF86keysym.h>
 #include <X11/extensions/XIproto.h>
 
-/* The libc wrapper just blows... linux/input.h must be included
- * before xf86_ansic.h and xf86_libc.h so we avoid defining ioctl
- * twice. */
-
 #include <linux/input.h>
 
 #include <misc.h>
 #include <xf86.h>
 #include <xf86str.h>
 #include <xf86_OSproc.h>
-#include <xf86_ansic.h>
-#include <xf86_libc.h>
 #include <xf86Xinput.h>
 #include <exevents.h>
 #include <mipointer.h>
-- 
cgit v1.2.3