xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/sdksyms.sh |    1 -
 include/meson.build   |    1 -
 2 files changed, 2 deletions(-)

New commits:
commit 5b2c00d38aef40feb868cc8ff5f2b3a9aab93bad
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Feb 8 16:28:58 2024 +0100

    include: drop closestr.h from public module API
    
    None of the public module API functions use the types defined in here,
    this file isn't even included anywhere (in the public headers). Thus it
    doesn't seem to be needed in the public API at all - so make it private.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1281>

diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 5fd5b5c2f..8083ad24b 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -231,7 +231,6 @@ cat > sdksyms.c << EOF
 /* include/Makefile.am */
 #include "XIstubs.h"
 #include "Xprintf.h"
-#include "closestr.h"
 #include "closure.h"
 #include "colormap.h"
 #include "colormapst.h"
diff --git a/include/meson.build b/include/meson.build
index c109bcc40..7d83273b9 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -450,7 +450,6 @@ if build_xorg
             'Xprintf.h',
             'callback.h',
             'client.h',
-            'closestr.h',
             'closure.h',
             'colormap.h',
             'colormapst.h',