Module Name: xsrc
Committed By: mrg
Date: Sat Aug 14 08:44:02 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-vmware/dist/src: vmwaremodule.c
Log Message:
merge xf86-video-vmware-11.0.2
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c
diff -u xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c:1.3 xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c:1.4
--- xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c:1.3 Sat May 29 05:11:48 2010
+++ xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c Sat Aug 14 08:44:02 2010
@@ -144,7 +144,7 @@
return FALSE;
}
-static Bool
+static void
vmware_chain_module(pointer opts)
{
int vmwlegacy_devices;
@@ -173,6 +173,7 @@
matched = vmwlegacy_devices;
}
+ /* Xorg -configure returns 1 from xf86MatchDevice with NULL gdevs */
for (i = 0; gdevs && i < vmware_devices; i++) {
gdev = gdevs[i];
gdev->driver = driver_name;
@@ -206,7 +207,6 @@
vmware_setup(pointer module, pointer opts, int *errmaj, int *errmin)
{
static Bool setupDone = 0;
- int ret;
/* This module should be loaded only once, but check to be sure. */
if (!setupDone) {
