xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/xf86_os_support.h |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9f78d548e5fa9a7970c4b5c661a7de9ec43dae2e
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Jun 17 20:45:51 2024 +0200

    fix FTBS on NetBSD
    
    ../hw/xfree86/os-support/bsd/bsd_init.c: In function ‘xf86CloseConsole’:
    ../hw/xfree86/os-support/xf86_os_support.h:22:6: error: ‘dispatchException’ undeclared (first use in this function)
       22 |  if (dispatchException & DE_TERMINATE) { \
          |      ^~~~~~~~~~~~~~~~~
    ../hw/xfree86/os-support/bsd/bsd_init.c:634:13: note: in expansion of macro ‘xf86FatalError’
      634 |             xf86FatalError("xf86CloseConsole: KDDISABIO failed (%s)",
          |             ^~~~~~~~~~~~~~
    ../hw/xfree86/os-support/xf86_os_support.h:22:6: note: each undeclared identifier is reported only once for each function it appears in
       22 |  if (dispatchException & DE_TERMINATE) { \
          |      ^~~~~~~~~~~~~~~~~
    ../hw/xfree86/os-support/bsd/bsd_init.c:634:13: note: in expansion of macro ‘xf86FatalError’
      634 |             xf86FatalError("xf86CloseConsole: KDDISABIO failed (%s)",
          |             ^~~~~~~~~~~~~~
    ../hw/xfree86/os-support/xf86_os_support.h:22:26: error: ‘DE_TERMINATE’ undeclared (first use in this function); did you mean ‘ACTION_TERMINATE’?
       22 |  if (dispatchException & DE_TERMINATE) { \
          |                          ^~~~~~~~~~~~
    ../hw/xfree86/os-support/bsd/bsd_init.c:634:13: note: in expansion of macro ‘xf86FatalError’
      634 |             xf86FatalError("xf86CloseConsole: KDDISABIO failed (%s)",
          |             ^~~~~~~~~~~~~~
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1575>

diff --git a/hw/xfree86/os-support/xf86_os_support.h b/hw/xfree86/os-support/xf86_os_support.h
index a45716cf4..a2fc99912 100644
--- a/hw/xfree86/os-support/xf86_os_support.h
+++ b/hw/xfree86/os-support/xf86_os_support.h
@@ -11,6 +11,7 @@
 #include <X11/Xdefs.h>
 
 #include "os.h"
+#include "dix/dix_priv.h"
 
 /*
  * This is to prevent re-entrancy to FatalError() when aborting.