xserver: Branch 'master'

[GitLab Mirror]

 include/os.h |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 37446b70de5416826823adad1360a73eb9bb67e1
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Sep 11 11:52:11 2024 +0200

    os.h: drop unnecessary guard on stdlib.h include
    
    It's a standard C header, that's always present, so no extra guard needed.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1684>

diff --git a/include/os.h b/include/os.h
index 51be06277..361c4552f 100644
--- a/include/os.h
+++ b/include/os.h
@@ -50,9 +50,7 @@ SOFTWARE.
 #include "misc.h"
 #include <stdarg.h>
 #include <stdint.h>
-#if defined(HAVE_REALLOCARRAY)
-#include <stdlib.h>       /* for reallocarray */
-#endif
+#include <stdlib.h>
 #include <string.h>
 #ifdef MONOTONIC_CLOCK
 #include <time.h>