Module Name: xsrc
Committed By: snj
Date: Thu Nov 17 16:52:53 UTC 2016
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Config.c
Log Message:
fix misplaced conditionalized } that broke pointer detection under
vmware when running X without a config file.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.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/xorg-server/dist/hw/xfree86/common/xf86Config.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.13 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.14
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.13 Thu Aug 11 00:04:29 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c Thu Nov 17 16:52:53 2016
@@ -1270,13 +1270,13 @@ checkCoreInputDevices(serverLayoutPtr se
} else {
#endif
defPtr.inp_driver = strdup("mouse");
+#if defined(__NetBSD__) && (defined(__i386__) || defined(__amd64__))
+ }
+#endif
confInput = &defPtr;
foundPointer = TRUE;
from = X_DEFAULT;
pointerMsg = "default mouse configuration";
-#if defined(__NetBSD__) && (defined(__i386__) || defined(__amd64__))
- }
-#endif
}
/* Add the core pointer device to the layout, and set it to Core. */
