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 + */ +#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 #include +#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 #include +#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 */