Module Name: xsrc
Committed By: mrg
Date: Sun Aug 14 01:02:22 UTC 2016
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
bsd_VTsw.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw: vgaHW.h
Log Message:
fix merge botches.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h
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/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.8 Thu Aug 11 00:04:29 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c Sun Aug 14 01:02:22 2016
@@ -339,6 +339,7 @@ listPossibleVideoDrivers(char *matches[]
#elif defined(__NetBSD__)
matches[i++] = xnfstrdup("wsfb");
#endif
+ }
}
/* copy a screen section and enter the desired driver
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c:1.4 Thu Aug 11 00:04:31 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c Sun Aug 14 01:02:22 2016
@@ -66,6 +66,7 @@ xf86VTSwitchPending()
Bool
xf86VTSwitchAway()
{
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
#ifdef WSCONS_SUPPORT
ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h:1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h:1.4
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h:1.3 Thu Aug 11 00:04:32 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h Sun Aug 14 01:02:22 2016
@@ -176,6 +176,7 @@ typedef struct _vgaHWRec {
(hw)->readST01((hw)); \
(hw)->readST01((hw)); \
} while (0)
+#endif
/* Function Prototypes */
