From 77effa6950fc8715a8337c1de6ffd4b1e53d3691 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 10 Nov 2025 13:56:59 +0100 Subject: [PATCH] [PR #1383] dix: unexport several extension related functions PR: https://github.com/X11Libre/xserver/pull/1383 --- Xext/geext.c | 1 + Xext/xtest.c | 3 ++- Xi/sendexev.c | 1 + dix/extension_priv.h | 8 ++++++++ dix/main.c | 1 + dix/privates.c | 1 + dix/registry.c | 1 + dix/swaprep.c | 1 + dix/swapreq.c | 1 + dix/tables.c | 1 + include/extension.h | 7 ------- include/extnsionst.h | 6 ------ mi/miinitext.c | 1 + os/utils.c | 1 + 14 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Xext/geext.c b/Xext/geext.c index 2cb31d86e4..1b5a5ed192 100644 --- a/Xext/geext.c +++ b/Xext/geext.c @@ -28,6 +28,7 @@ #include #include +#include "dix/extension_priv.h" #include "dix/dix_priv.h" #include "dix/request_priv.h" #include "miext/extinit_priv.h" diff --git a/Xext/xtest.c b/Xext/xtest.c index 9f2e634758..6343c5e6fc 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -35,9 +35,10 @@ #include #include -#include "dix/input_priv.h" #include "dix/dix_priv.h" #include "dix/exevents_priv.h" +#include "dix/extension_priv.h" +#include "dix/input_priv.h" #include "dix/inpututils_priv.h" #include "dix/request_priv.h" #include "dix/screensaver_priv.h" diff --git a/Xi/sendexev.c b/Xi/sendexev.c index 4ce151da11..a2d65e5406 100644 --- a/Xi/sendexev.c +++ b/Xi/sendexev.c @@ -58,6 +58,7 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/exevents_priv.h" #include "dix/request_priv.h" +#include "dix/extension_priv.h" #include "Xi/handlers.h" #include "inputstr.h" /* DeviceIntPtr */ diff --git a/dix/extension_priv.h b/dix/extension_priv.h index bcd2170501..03fd757e70 100644 --- a/dix/extension_priv.h +++ b/dix/extension_priv.h @@ -58,4 +58,12 @@ typedef struct { extern CallbackListPtr ExtensionAccessCallback; extern CallbackListPtr ExtensionDispatchCallback; +void EnableDisableExtensionError(const char *name, Bool enable); +void InitExtensions(int argc, char **argv); +void CloseDownExtensions(void); + +ExtensionEntry *GetExtensionEntry(int major); + +void NotImplemented(xEvent *, xEvent *) _X_NORETURN; + #endif /* _XSERVER_EXTENSION_PRIV_H */ diff --git a/dix/main.c b/dix/main.c index b7d32a79d3..873d6cf84b 100644 --- a/dix/main.c +++ b/dix/main.c @@ -89,6 +89,7 @@ Equipment Corporation. #include "dix/callback_priv.h" #include "dix/cursor_priv.h" #include "dix/dix_priv.h" +#include "dix/extension_priv.h" #include "dix/input_priv.h" #include "dix/gc_priv.h" #include "dix/pixmap_priv.h" diff --git a/dix/privates.c b/dix/privates.c index 860c56e02f..20f970f9d9 100644 --- a/dix/privates.c +++ b/dix/privates.c @@ -53,6 +53,7 @@ from The Open Group. #include #include "dix/colormap_priv.h" +#include "dix/extension_priv.h" #include "dix/resource_priv.h" #include "dix/screenint_priv.h" diff --git a/dix/registry.c b/dix/registry.c index 93cc11eeba..9b3de599e1 100644 --- a/dix/registry.c +++ b/dix/registry.c @@ -24,6 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include +#include "dix/extension_priv.h" #include "dix/registry_priv.h" #include "dix/resource_priv.h" diff --git a/dix/swaprep.c b/dix/swaprep.c index 78b9074d8e..062e11271d 100644 --- a/dix/swaprep.c +++ b/dix/swaprep.c @@ -51,6 +51,7 @@ SOFTWARE. #include #include "dix/dix_priv.h" +#include "dix/extension_priv.h" #include "misc.h" #include "dixstruct.h" diff --git a/dix/swapreq.c b/dix/swapreq.c index 6ad0cae11c..d5d5a644f8 100644 --- a/dix/swapreq.c +++ b/dix/swapreq.c @@ -51,6 +51,7 @@ SOFTWARE. #include #include "dix/dix_priv.h" +#include "dix/extension_priv.h" #include "dix/reqhandlers_priv.h" #include "misc.h" diff --git a/dix/tables.c b/dix/tables.c index d1514e8684..1c1a5aaa6c 100644 --- a/dix/tables.c +++ b/dix/tables.c @@ -50,6 +50,7 @@ SOFTWARE. #include #include "dix/dix_priv.h" +#include "dix/extension_priv.h" #include "dix/reqhandlers_priv.h" #include "windowstr.h" diff --git a/include/extension.h b/include/extension.h index a4c09dee1e..4db26c5509 100644 --- a/include/extension.h +++ b/include/extension.h @@ -90,13 +90,6 @@ extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client */ ); extern _X_EXPORT Bool EnableDisableExtension(const char *name, Bool enable); -extern _X_EXPORT void EnableDisableExtensionError(const char *name, - Bool enable); - -extern _X_EXPORT void InitExtensions(int argc, char **argv); - -extern _X_EXPORT void CloseDownExtensions(void); - extern _X_EXPORT void LoadExtensionList(const ExtensionModule ext[], int listSize, Bool external); diff --git a/include/extnsionst.h b/include/extnsionst.h index 80c5423395..32ef1f37fd 100644 --- a/include/extnsionst.h +++ b/include/extnsionst.h @@ -79,10 +79,6 @@ typedef void (*EventSwapPtr) (xEvent *, xEvent *); extern _X_EXPORT EventSwapPtr EventSwapVector[128]; -extern _X_EXPORT void -NotImplemented( /* FIXME: this may move to another file... */ - xEvent *, xEvent *) _X_NORETURN; - extern _X_EXPORT ExtensionEntry * AddExtension(const char * /*name */ , int /*NumEvents */ , @@ -95,7 +91,5 @@ AddExtension(const char * /*name */ , extern _X_EXPORT ExtensionEntry * CheckExtension(const char *extname); -extern _X_EXPORT ExtensionEntry * -GetExtensionEntry(int major); #endif /* EXTENSIONSTRUCT_H */ diff --git a/mi/miinitext.c b/mi/miinitext.c index a5882787b6..dd42a41495 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -88,6 +88,7 @@ SOFTWARE. #undef CONFIG_MITSHM #endif +#include "dix/extension_priv.h" #include "miext/extinit_priv.h" #include "misc.h" diff --git a/os/utils.c b/os/utils.c index d92cce1cca..e3c0cb7ad6 100644 --- a/os/utils.c +++ b/os/utils.c @@ -104,6 +104,7 @@ __stdcall unsigned long GetTickCount(void); #endif #include "dix/dix_priv.h" +#include "dix/extension_priv.h" #include "dix/input_priv.h" #include "dix/settings_priv.h" #include "dix/screensaver_priv.h"