xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit cda799533f10c6fe8510bcfc1605a11e8d77abfe
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Mar 19 16:20:00 2024 +0100

    xfree86: os-support: bsd: fix missing include of xf86_OSproc.h
    
    Missing include of xf86_OSproc.h leads to missing prototype warnings.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1697>

diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c
index f0e54ee5e..3016d691b 100644
--- a/hw/xfree86/os-support/bsd/bsd_VTsw.c
+++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c
@@ -28,10 +28,12 @@
 #endif
 
 #include <X11/X.h>
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_os_support.h"
 #include "xf86_OSlib.h"
+#include "xf86_OSproc.h"
 
 /*
  * Handle the VT-switching interface for BSD OSs that use USL-style ioctl()s.
diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index ae6f28b58..2ef34ba29 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -36,6 +36,7 @@
 #include "xf86Priv.h"
 #include "xf86_os_support.h"
 #include "xf86_OSlib.h"
+#include "xf86_OSproc.h"
 
 #include <sys/utsname.h>
 #include <sys/ioctl.h>