xserver: Branch 'master'

[GitLab Mirror]

 meson.build    |    1 +
 os/xsha1.c     |    2 +-
 render/glyph.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 40c5d39c552b4ba594fbfec70d1d8e91b9290155
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Mar 1 16:53:49 2024 +0100

    include: move xsha1.h to os/
    
    This header is never exported and belongs to OS layer, thus no need to have it
    in include/ directory, where all the public ones are - better off under os/.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1350>

diff --git a/meson.build b/meson.build
index 09f2d7a57..eb8f054e8 100644
--- a/meson.build
+++ b/meson.build
@@ -643,6 +643,7 @@ common_dep = [
 ]
 
 inc = include_directories(
+    '.',
     'Xext',
     'Xi',
     'composite',
diff --git a/os/xsha1.c b/os/xsha1.c
index a160b7eb4..f2863f523 100644
--- a/os/xsha1.c
+++ b/os/xsha1.c
@@ -28,7 +28,7 @@
 #endif
 
 #include "os.h"
-#include "xsha1.h"
+#include "os/xsha1.h"
 
 #if defined(HAVE_SHA1_IN_LIBMD)  /* Use libmd for SHA1 */ \
 	|| defined(HAVE_SHA1_IN_LIBC)   /* Use libc for SHA1 */
diff --git a/include/xsha1.h b/os/xsha1.h
similarity index 100%
rename from include/xsha1.h
rename to os/xsha1.h
diff --git a/render/glyph.c b/render/glyph.c
index 3396df375..850ea8440 100644
--- a/render/glyph.c
+++ b/render/glyph.c
@@ -26,7 +26,7 @@
 #include <dix-config.h>
 #endif
 
-#include "xsha1.h"
+#include "os/xsha1.h"
 
 #include "misc.h"
 #include "scrnintstr.h"