xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/xf86_OSlib.h |    2 --
 os/backtrace.c                     |    5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ccfa7e9f2e0c05a2a2e3d4577c821192960ceac9
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Mar 18 16:06:43 2024 +0100

    Fix missing include of <sys/wait.h>
    
    Instead of relying on indirect includes, it's much cleaner if everybody
    includes directly what he needs.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1419>

diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 12992914c..60bcb593f 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -314,8 +314,6 @@ struct pcvtid {
 /* Generic                                                                */
 /**************************************************************************/
 
-#include <sys/wait.h>           /* May need to adjust this for other OSs */
-
 /* For PATH_MAX */
 #include "misc.h"
 
diff --git a/os/backtrace.c b/os/backtrace.c
index 8025bffae..e4cb91b1c 100644
--- a/os/backtrace.c
+++ b/os/backtrace.c
@@ -27,9 +27,14 @@
 
 #include "os.h"
 #include "misc.h"
+
 #include <errno.h>
 #include <string.h>
 
+#ifndef WIN32
+#include <sys/wait.h>
+#endif
+
 #ifdef HAVE_LIBUNWIND
 
 #define UNW_LOCAL_ONLY