xserver: Branch 'master'

[GitLab Mirror]

 dix/callback_priv.h |   15 +++++++++++++++
 dix/dixutils.c      |    6 ++++--
 dix/main.c          |    1 +
 include/callback.h  |    5 -----
 4 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit 7f13fc7d2fcc57062e9929c0961397f509d11fdd
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Feb 29 18:44:33 2024 +0100

    dix: unexport callback manager init / teardown functions
    
    Those are only needed inside DIX, thus no need to export them.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1346>

diff --git a/dix/callback_priv.h b/dix/callback_priv.h
new file mode 100644
index 000000000..d0240bfd7
--- /dev/null
+++ b/dix/callback_priv.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info at metux.net>
+ */
+#ifndef _XSERVER_CALLBACK_PRIV_H
+#define _XSERVER_CALLBACK_PRIV_H
+
+#include "callback.h"
+
+typedef struct _CallbackList *CallbackListPtr;
+
+void InitCallbackManager(void);
+void DeleteCallbackManager(void);
+
+#endif /* _XSERVER_CALLBACK_PRIV_H */
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 5ae548b9d..d1edc11c6 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -87,6 +87,7 @@ Author:  Adobe Systems Incorporated
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
+#include "dix/callback_priv.h"
 #include "dix/dix_priv.h"
 
 #include "misc.h"
@@ -739,6 +740,8 @@ _DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void *data)
     return FALSE;
 }
 
+static void DeleteCallbackList(CallbackListPtr *pcbl);
+
 void
 _CallCallbacks(CallbackListPtr *pcbl, void *call_data)
 {
@@ -871,8 +874,7 @@ DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void *data)
     return _DeleteCallback(pcbl, callback, data);
 }
 
-void
-DeleteCallbackList(CallbackListPtr *pcbl)
+static void DeleteCallbackList(CallbackListPtr *pcbl)
 {
     if (!pcbl || !*pcbl)
         return;
diff --git a/dix/main.c b/dix/main.c
index 4ecb8955e..567e1324e 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -83,6 +83,7 @@ Equipment Corporation.
 #include <X11/Xproto.h>
 #include <pixman.h>
 
+#include "dix/callback_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/registry_priv.h"
 
diff --git a/include/callback.h b/include/callback.h
index fe7015ee7..a1f9f15c0 100644
--- a/include/callback.h
+++ b/include/callback.h
@@ -83,9 +83,4 @@ CallCallbacks(CallbackListPtr *pcbl, void *call_data)
     _CallCallbacks(pcbl, call_data);
 }
 
-extern _X_EXPORT void DeleteCallbackList(CallbackListPtr *pcbl);
-
-extern _X_EXPORT void InitCallbackManager(void);
-extern _X_EXPORT void DeleteCallbackManager(void);
-
 #endif                          /* CALLBACK_H */