diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/mouse.c | 8 | ||||
| -rw-r--r-- | src/pnp.c | 2 |
4 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,10 @@ +2006-04-06 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/mouse.c: + * src/pnp.c: + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + 2006-03-09 Eric Anholt <anholt@FreeBSD.org> * src/mouse.c: (MouseCommonOptions): diff --git a/configure.ac b/configure.ac index 71b0aaa..b14bc9c 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-mouse], - 1.0.4, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-mouse) @@ -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 >= 0.99.3 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/mouse.c b/src/mouse.c index cd4b37e..629bf03 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -1,4 +1,4 @@ -/* $XdotOrg: driver/xf86-input-mouse/src/mouse.c,v 1.25 2006/02/28 19:44:45 ajax Exp $ */ +/* $XdotOrg: driver/xf86-input-mouse/src/mouse.c,v 1.26 2006/04/03 21:18:50 anholt Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.79 2003/11/03 05:11:48 tsi Exp $ */ /* * @@ -49,6 +49,9 @@ #include "config.h" #endif +#include <math.h> +#include <string.h> +#include <stdio.h> #define NEED_EVENTS #include <X11/X.h> #include <X11/Xproto.h> @@ -68,7 +71,6 @@ #include "xf86_OSproc.h" #include "xf86OSmouse.h" #define NEED_XF86_TYPES /* for xisb.h when !XFree86LOADER */ -#include "xf86_ansic.h" #include "compiler.h" #include "xisb.h" @@ -3726,7 +3728,7 @@ static XF86ModuleVersionInfo xf86MouseVersionRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 0, 4, + 1, 1, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, @@ -25,6 +25,7 @@ #include "config.h" #endif +#include <stdio.h> #define NEED_EVENTS #include <X11/X.h> #include <X11/Xproto.h> @@ -35,7 +36,6 @@ #include "xf86Xinput.h" #include "xf86_OSproc.h" #include "xf86OSmouse.h" -#include "xf86_ansic.h" #include "mouse.h" #include "mousePriv.h" |