Module Name: xsrc
Committed By: mrg
Date: Tue Dec 8 10:33:47 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c
Log Message:
add dummy ddxInputThreadInit() if INPUTTHREAD is defined.
fixes sun3 build and should fix x68k build too.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.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/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.9 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.9 Sun Nov 1 11:40:53 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c Tue Dec 8 10:33:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.9 2020/11/01 11:40:53 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.10 2020/12/08 10:33:47 mrg Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -261,4 +261,13 @@ OsVendorFatalError(const char *f, va_lis
{
}
+#if INPUTTHREAD
+/** This function is called in Xserver/os/inputthread.c when starting
+ the input thread. */
+void
+ddxInputThreadInit(void)
+{
+}
+#endif
+
/* EOF x68kInit.c */
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.5 Thu Aug 13 05:12:35 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c Tue Dec 8 10:33:47 2020
@@ -190,6 +190,15 @@ AbortDDX(enum ExitCode error)
LogClose(error);
}
+#if INPUTTHREAD
+/** This function is called in Xserver/os/inputthread.c when starting
+ the input thread. */
+void
+ddxInputThreadInit(void)
+{
+}
+#endif
+
/* Called by GiveUp(). */
void
ddxGiveUp(enum ExitCode error)
