summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/vmmouse.c8
-rw-r--r--src/vmmouse_proto.h12
2 files changed, 15 insertions, 5 deletions
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