diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/xf86HyperPen.c | 6 |
3 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2006-04-06 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/xf86HyperPen.c: + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + 2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/configure.ac b/configure.ac index 5ea762b..7218c19 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-hyperpen], - 1.0.0.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-hyperpen) @@ -75,7 +75,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) 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/xf86HyperPen.c b/src/xf86HyperPen.c index fb96910..b109787 100644 --- a/src/xf86HyperPen.c +++ b/src/xf86HyperPen.c @@ -50,16 +50,14 @@ #ifdef XFREE86_V4 /* post 3.9 headers */ -#ifndef XFree86LOADER #include <unistd.h> #include <errno.h> -#endif +#include <string.h> #include <misc.h> #include <xf86.h> #define NEED_XF86_TYPES #if !defined(DGUX) -#include <xf86_ansic.h> #include <xisb.h> #endif #include <xf86_OSproc.h> @@ -1768,7 +1766,7 @@ static XF86ModuleVersionInfo xf86HypVersionRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 0, 0, + 1, 1, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, |