xf86-input-vmmouse: Changes to 'master'
Thomas Hellstrom
thomash at kemper.freedesktop.org
Wed Oct 8 03:11:27 PDT 2014
configure.ac | 14 ++++++
shared/vmmouse_client.h | 1
tools/Makefile.am | 7 ++-
tools/vmmouse_detect.c | 5 ++
tools/vmmouse_udev.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 129 insertions(+), 2 deletions(-)
New commits:
commit 1cbbc03c4b37d57760c57bd2e0b0f89d744a5795
Author: Stefan Dirsch <sndirsch at suse.de>
Date: Tue Oct 7 11:32:01 2014 +0200
vmmouse_client.h: Include xorg-server.h before xf86_OSproc.h
xf86_OSproc.h cannot be included without first including xorg-server.h.
Without this the build fails on systems with the latest glibc,
throwing this error:
In file included from /usr/include/string.h:634:0,
from /usr/include/xorg/os.h:53,
from /usr/include/xorg/misc.h:115,
from /usr/include/xorg/window.h:50,
from /usr/include/xorg/globals.h:7,
from /usr/include/xorg/opaque.h:34,
from /usr/include/xorg/xf86_OSproc.h:127,
from vmmouse_client.h:42,
from vmmouse_client.c:38:
/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
strndup(const char *str, size_t n);
This is caused by HAVE_STRNDUP not being set (it is set from xorg-server.h),
causing os.h to redefine it.
Signed-off-by: Stefan Dirsch <sndirsch at suse.de>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Acked-by: Thomas Hellstrom <thellstrom at vmware.com>
commit 576e8123d9f9f01ef6041cdfb96ca811197d05d2
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date: Wed Oct 1 21:04:30 2014 +0200
Back off if we detect a vmmouse kernel driver v3
If a vmmouse kernel driver is active, vmmouse input is handled by the Xorg
evdev driver and not by the vmmouse driver, so make sure the vmmouse_detect
utility doesn't detect a vmmouse if a kernel driver is active.
v2: Change the vmmouse kernel device name, fix comment.
v3: Fix up libudev error handling.
Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
Reviewed-by: Sinclair Yeh <syeh at vmware.com>
More information about the xorg-commit
mailing list