diff options
| author | Vinay Bondhugula <vinayb@vmware.com> | 2008-04-22 18:53:16 -0400 |
|---|---|---|
| committer | Vinay Bondhugula <vinayb@vmware.com> | 2008-04-22 18:53:16 -0400 |
| commit | 08f6ba03b1368e23bda4d51b16e182079fe9c409 (patch) | |
| tree | c7fbfabd8e01bd264636ac316c75b0e0e8810f94 | |
| parent | f9629096c1e0ac0e090642cf6a53674842aaf9a8 (diff) | |
Compatibility with older versions of X
- Makes the driver compile againt older versions of X (tested upto 4.3).
- Bump up the version number in configure.ac and the modinfo section.
- A couple of trivial whitespace cleanups.
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/vmmouse.c | 8 | ||||
| -rw-r--r-- | src/vmmouse_proto.h | 12 |
3 files changed, 21 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 4374b2b..7013426 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-vmmouse], - 12.5.0, + 12.5.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-vmmouse) @@ -75,9 +75,13 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.1] xproto $REQUIRED_MODULES) sdkdir=$(pkg-config --variable=sdkdir xorg-server) +PKG_CHECK_EXISTS([xorg-server >= 1.1.0], + [AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1, + [Has version 1.1.0 or greater of the Xserver])]) + CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' AC_SUBST([CFLAGS]) diff --git a/src/vmmouse.c b/src/vmmouse.c index bd3763b..8c9ba55 100644 --- a/src/vmmouse.c +++ b/src/vmmouse.c @@ -32,11 +32,11 @@ * * This is a modified version of the mouse input driver * provided in Xserver/hw/xfree86/input/mouse/mouse.c - * + * * Although all data is read using the vmmouse protocol, notification * is still done through the PS/2 port, so all the basic code for * interacting with the port is retained. - * + * */ @@ -94,8 +94,8 @@ * Version constants */ #define VMMOUSE_MAJOR_VERSION 12 -#define VMMOUSE_MINOR_VERSION 4 -#define VMMOUSE_PATCHLEVEL 3 +#define VMMOUSE_MINOR_VERSION 5 +#define VMMOUSE_PATCHLEVEL 1 #define VMMOUSE_DRIVER_VERSION \ (VMMOUSE_MAJOR_VERSION * 65536 + VMMOUSE_MINOR_VERSION * 256 + VMMOUSE_PATCHLEVEL) #define VMMOUSE_DRIVER_VERSION_STRING \ diff --git a/src/vmmouse_proto.h b/src/vmmouse_proto.h index 6a08e27..a2eb1e4 100644 --- a/src/vmmouse_proto.h +++ b/src/vmmouse_proto.h @@ -36,10 +36,20 @@ #ifndef _VMMOUSE_PROTO_H_ #define _VMMOUSE_PROTO_H_ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdint.h> + +#ifdef HAVE_XORG_SERVER_1_1_0 #include <unistd.h> +#else +#include "xf86_libc.h" +#endif -#if !defined __i386__ && !defined __x86_64__ +#if !defined __i386__ && !defined __x86_64__ #error The vmmouse protocol is only supported on x86 architectures. #endif |