xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/bsd/bsd_init.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8ce76acddf5ae83546a0b9fbc01c862007ccba72
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Mar 27 19:19:00 2024 +0100

    xfree86: os-support: bsd fix warning on unused label on NetBSD
    
    The label is only used on FreeBSD, so compiling on NetBSD gives a
    warning on unused label.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1447>

diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index 393691be8..dcbb7b91e 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -255,7 +255,9 @@ xf86OpenConsole(void)
                 sleep(1);
             }
 #endif
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
  acquire_vt:
+#endif
             if (!xf86Info.ShareVTs) {
                 /*
                  * now get the VT