[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/os couple of changes needed ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/06b982b39c2f
branches:  trunk
changeset: 7113:06b982b39c2f
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jul 15 19:10:11 2022 +0000

description:
couple of changes needed for xorg-server 21.1.4.

- AbortDDX() is removed, make it static to avoid code churn since
  it is used by internal code now
- LegalModifier() is gone
- if the PRESENT extension isn't included, don't enable the
  -fakescreenfps option since it require PRESENT.

fixes builds for sun3 and x68k.

diffstat:

 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c |  4 ++--
 external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c  |  8 +-------
 external/mit/xorg-server/dist/hw/sun/sunIo.c            |  2 +-
 external/mit/xorg-server/dist/hw/sun/sunKbd.c           |  7 -------
 external/mit/xorg-server/dist/os/utils.c                |  5 +++++
 5 files changed, 9 insertions(+), 17 deletions(-)

diffs (86 lines):

diff -r e460f5f5dd21 -r 06b982b39c2f external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c   Fri Jul 15 09:12:24 2022 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c   Fri Jul 15 19:10:11 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.10 2020/12/08 10:33:47 mrg Exp $ */
+/* $NetBSD: x68kInit.c,v 1.11 2022/07/15 19:10:11 mrg Exp $ */
 /*-------------------------------------------------------------------------
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -188,7 +188,7 @@
  *  argument: ExitCode
  *  returns:  nothing
  *-----------------------------------------------------------------------*/
-void
+static void
 AbortDDX(enum ExitCode error)
 {
     int i;
diff -r e460f5f5dd21 -r 06b982b39c2f external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c    Fri Jul 15 09:12:24 2022 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c    Fri Jul 15 19:10:11 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.12 2021/03/17 15:02:27 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.13 2022/07/15 19:10:11 mrg Exp $ */
 /*-------------------------------------------------------------------------
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -403,10 +403,4 @@
         ErrorF("Failed to set keyboard lights\n");
 }
 
-Bool
-LegalModifier(unsigned int key, DeviceIntPtr pDev)
-{
-    return TRUE;
-}
-
 /* EOF x68kKbd.c */
diff -r e460f5f5dd21 -r 06b982b39c2f external/mit/xorg-server/dist/hw/sun/sunIo.c
--- a/external/mit/xorg-server/dist/hw/sun/sunIo.c      Fri Jul 15 09:12:24 2022 +0000
+++ b/external/mit/xorg-server/dist/hw/sun/sunIo.c      Fri Jul 15 19:10:11 2022 +0000
@@ -158,7 +158,7 @@
 /*
  * DDX - specific abort routine.  Called by AbortServer().
  */
-void
+static void
 AbortDDX(enum ExitCode error)
 {
     int                i;
diff -r e460f5f5dd21 -r 06b982b39c2f external/mit/xorg-server/dist/hw/sun/sunKbd.c
--- a/external/mit/xorg-server/dist/hw/sun/sunKbd.c     Fri Jul 15 09:12:24 2022 +0000
+++ b/external/mit/xorg-server/dist/hw/sun/sunKbd.c     Fri Jul 15 19:10:11 2022 +0000
@@ -907,10 +907,3 @@
 #endif /* } */
     return 0;
 }
-
-/*ARGSUSED*/
-Bool
-LegalModifier(unsigned int key, DeviceIntPtr pDev)
-{
-    return TRUE;
-}
diff -r e460f5f5dd21 -r 06b982b39c2f external/mit/xorg-server/dist/os/utils.c
--- a/external/mit/xorg-server/dist/os/utils.c  Fri Jul 15 09:12:24 2022 +0000
+++ b/external/mit/xorg-server/dist/os/utils.c  Fri Jul 15 19:10:11 2022 +0000
@@ -787,6 +787,7 @@
                 UseMsg();
         }
         else if (strcmp(argv[i], "-fakescreenfps") == 0) {
+#ifdef PRESENT
             if (++i < argc) {
                 FakeScreenFps = (uint32_t) atoi(argv[i]);
                 if (FakeScreenFps < 1 || FakeScreenFps > 600)
@@ -794,6 +795,10 @@
             }
             else
                 UseMsg();
+#else
+            FatalError("fakescreenfps not available without PRESENT\n");
+            UseMsg();
+#endif
         }
         else if (strcmp(argv[i], "-fp") == 0) {
             if (++i < argc) {