xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit e1c5be126b25662ed49aca164e7f8d6e7552f3cf
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Mar 18 18:51:04 2024 -0700

    bsd_init.c: fix build on FreeBSD
    
    Commit 0d4a7ed6 put the definition of pcvt_version inside #ifdef __NetBSD__
    but left one use of it outside of the ifdefs, resulting in a build failure
    on FreeBSD 14.0 in the gitlab CI for xf86-input-keyboard.
    
    ../hw/xfree86/os-support/bsd/bsd_init.c:540:21:
      error: use of undeclared identifier 'pcvt_version'
                        pcvt_version.rmajor, pcvt_version.rminor);
                        ^
    ../hw/xfree86/os-support/bsd/bsd_init.c:540:42:
      error: use of undeclared identifier 'pcvt_version'
                        pcvt_version.rmajor, pcvt_version.rminor);
                                             ^
    
    Fixes: 0d4a7ed68 ("bsd_init.c: fix build on OpenBSD")
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1424>

diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index 0f5de9f97..100683a21 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -536,8 +536,12 @@ xf86OpenPcvt()
                     vtname);
 #endif
 #else
+# ifdef __NetBSD__
             xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n",
                     pcvt_version.rmajor, pcvt_version.rminor);
+# else
+            xf86Msg(X_PROBED, "Using pcvt driver\n");
+# endif
 #endif
 #ifdef __NetBSD__
         }