xserver: Branch 'master'

[GitLab Mirror]

 dix/atom.c         |    7 +++++--
 dix/dix_priv.h     |    3 +++
 dix/generate-atoms |    3 +++
 include/misc.h     |    2 --
 4 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit b3ec0bf58a1cbf32405e3421855929bd65a42390
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Feb 17 15:52:41 2025 +0100

    dix: unexport MakePredeclaredAtoms()
    
    Should never be called by modules/drivers.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1802>

diff --git a/dix/atom.c b/dix/atom.c
index f0e6e2dc8..194b2baec 100644
--- a/dix/atom.c
+++ b/dix/atom.c
@@ -46,10 +46,13 @@ SOFTWARE.
 
 #include <dix-config.h>
 
-#include <X11/X.h>
-#include <X11/Xatom.h>
 #include <stdio.h>
 #include <string.h>
+#include <X11/X.h>
+#include <X11/Xatom.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "resource.h"
 #include "dix.h"
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 8a85ed35d..208e5b618 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -253,4 +253,7 @@ extern Bool explicit_display;
 extern Bool disableBackingStore;
 extern Bool enableBackingStore;
 
+/* in generated BuiltInAtoms.c */
+void MakePredeclaredAtoms(void);
+
 #endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/generate-atoms b/dix/generate-atoms
index 86b1477a7..780548919 100755
--- a/dix/generate-atoms
+++ b/dix/generate-atoms
@@ -25,6 +25,9 @@ cat > "$OUTPUT" << __END__
 
 #include <X11/X.h>
 #include <X11/Xatom.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "dix.h"
 void
diff --git a/include/misc.h b/include/misc.h
index 890e45ffa..910dd6469 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -377,8 +377,6 @@ extern _X_EXPORT void SwapLongs(CARD32 *list, unsigned long count);
 
 extern _X_EXPORT void SwapShorts(short *list, unsigned long count);
 
-extern _X_EXPORT void MakePredeclaredAtoms(void);
-
 typedef struct _xPoint *DDXPointPtr;
 typedef struct pixman_box16 *BoxPtr;
 typedef struct _xEvent *xEventPtr;