summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 18:17:10 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 18:17:10 +0000
commit16e12c2c08a92a7bb9c11d4a359bf9904998e93f (patch)
tree5df729b18aade6f3cf7ca691a0b314c7a797c6fa
parent6a74d428e2ce1ad07b9dc8b361bd7c2e71dd19d0 (diff)
Unlibcwrap. Bump server version requirement. Bump to 12.4.0.xf86-video-impact-0_2_0vmmouse-12_4_0XORG-7_1
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac4
-rw-r--r--src/vmmouse.c6
-rw-r--r--src/vmmouse_proto.h2
4 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 307fae1..467041b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-06 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/vmmouse.c:
+ * src/vmmouse_proto.h:
+ Unlibcwrap. Bump server version requirement. Bump to 12.4.0.
+
2006-03-28 Philip Langdale <plangdale@vmware.com>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 1093932..bf558be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- 12.3.2.0,
+ 12.4.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
@@ -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/vmmouse.c b/src/vmmouse.c
index f927831..5543c4c 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -47,6 +47,7 @@
#include "config.h"
#endif
+#include <stdio.h>
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
@@ -65,7 +66,6 @@
#include "xf86Xinput.h"
#include "xf86_OSproc.h"
#include "xf86OSmouse.h"
-#include "xf86_ansic.h"
#include "compiler.h"
#include "xisb.h"
@@ -80,8 +80,8 @@
* Version constants
*/
#define VMMOUSE_MAJOR_VERSION 12
-#define VMMOUSE_MINOR_VERSION 3
-#define VMMOUSE_PATCHLEVEL 2
+#define VMMOUSE_MINOR_VERSION 4
+#define VMMOUSE_PATCHLEVEL 0
/*****************************************************************************
* static function header
diff --git a/src/vmmouse_proto.h b/src/vmmouse_proto.h
index 5089e5b..6a08e27 100644
--- a/src/vmmouse_proto.h
+++ b/src/vmmouse_proto.h
@@ -37,7 +37,7 @@
#define _VMMOUSE_PROTO_H_
#include <stdint.h>
-#include "xf86_libc.h"
+#include <unistd.h>
#if !defined __i386__ && !defined __x86_64__
#error The vmmouse protocol is only supported on x86 architectures.