summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphilipl <philipl>2006-03-29 02:36:23 +0000
committerphilipl <philipl>2006-03-29 02:36:23 +0000
commit6a74d428e2ce1ad07b9dc8b361bd7c2e71dd19d0 (patch)
tree70093138a5d77efe6deba8dc3251fb56309ddd2c
parent1d7b250cbda0b96a494a17fdfb53eb971907a35b (diff)
Bump PATCHLEVEL.release-12-3-2-0
Use the right #define when detecting a 64bit compilation. This fixes the driver to actually work for 64bit builds.
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac2
-rw-r--r--src/vmmouse.c2
-rw-r--r--src/vmmouse_proto.h2
4 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a33efd9..307fae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-28 Philip Langdale <plangdale@vmware.com>
+
+ * configure.ac:
+ * src/vmmouse.c: Bump PATCHLEVEL.
+ * src/vmmouse_proto.h: Use the right #define
+ when detecting a 64bit compilation. This fixes
+ the driver to actually work for 64bit builds.
+
2006-01-16 Philip Langdale <plangdale@vmware.com>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 7c8db09..1093932 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- 12.3.1.0,
+ 12.3.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 6f366d6..f927831 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -81,7 +81,7 @@
*/
#define VMMOUSE_MAJOR_VERSION 12
#define VMMOUSE_MINOR_VERSION 3
-#define VMMOUSE_PATCHLEVEL 1
+#define VMMOUSE_PATCHLEVEL 2
/*****************************************************************************
* static function header
diff --git a/src/vmmouse_proto.h b/src/vmmouse_proto.h
index fa7dff1..5089e5b 100644
--- a/src/vmmouse_proto.h
+++ b/src/vmmouse_proto.h
@@ -60,7 +60,7 @@
uint32_t vE##_r; \
}
-#ifdef VM_X86_64
+#ifdef __x86_64__
#define DECLARE_REG64_STRUCT(_r) \
union { \