From b49a585faef59737f668b94d85dc8a6a4efeeda2 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 5 May 2025 16:39:49 +0200
Subject: [PATCH] Xext: geext: unexport GERegisterExtension() and document it

Not used by any external module (eg drivers), so no need to keep it
exported. Also documenting it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xext/dpms.c             |  2 +-
 Xext/geext.c            |  9 ++++++---
 Xext/geext.h            |  7 -------
 Xext/geext_priv.h       | 19 +++++++++++++++++++
 Xi/extinit.c            |  2 +-
 present/present_event.c |  2 +-
 6 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 Xext/geext_priv.h

diff --git a/Xext/dpms.c b/Xext/dpms.c
index 597f5cf4d..7839cd2a1 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -32,7 +32,7 @@ Equipment Corporation.
 #include <X11/Xproto.h>
 
 #include "os/screensaver.h"
-#include "Xext/geext.h"
+#include "Xext/geext_priv.h"
 
 #include "misc.h"
 #include "os.h"
diff --git a/Xext/geext.c b/Xext/geext.c
index 96352ee0b..2ddff31ba 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -24,10 +24,13 @@
  */
 
 #include <dix-config.h>
-#include "windowstr.h"
-#include <X11/extensions/ge.h>
 
-#include "geext.h"
+#include <X11/extensions/ge.h>
+#include <X11/extensions/geproto.h>
+
+#include "Xext/geext_priv.h"
+
+#include "windowstr.h"
 #include "protocol-versions.h"
 #include "extinit_priv.h"
 
diff --git a/Xext/geext.h b/Xext/geext.h
index 836a10103..81fd98608 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -31,11 +31,4 @@ from the author.
 #include <X11/Xfuncproto.h>
 #include <X11/extensions/geproto.h>
 
-/* Interface for other extensions */
-extern _X_EXPORT void GERegisterExtension(int extension,
-                                          void (*ev_dispatch) (xGenericEvent
-                                                               *from,
-                                                               xGenericEvent
-                                                               *to));
-
 #endif                          /* _GEEXT_H_ */
diff --git a/Xext/geext_priv.h b/Xext/geext_priv.h
new file mode 100644
index 000000000..fc701f0bd
--- /dev/null
+++ b/Xext/geext_priv.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XORG_GEEXT_PRIV_H
+
+#include <X11/Xproto.h>
+
+typedef void (*XorgGESwapProcPtr) (xGenericEvent *from, xGenericEvent *to);
+
+/*
+ * Register generic event extension dispatch handler
+ *
+ * @param extension base opcode
+ * @param event swap handler function
+ */
+void GERegisterExtension(int extension, XorgGESwapProcPtr swap_handler);
+
+#endif /* _XORG_GEEXT_PRIV_H */
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 1dad52081..3ebb061dc 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -60,11 +60,11 @@ SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "Xext/geext_priv.h"
 
 #include "inputstr.h"
 #include "gcstruct.h"           /* pointer for extnsionst.h */
 #include "extnsionst.h"         /* extension entry   */
-#include "geext.h"              /* extension interfaces for ge */
 #include "extinit_priv.h"
 #include "exglobals.h"
 #include "swaprep.h"
diff --git a/present/present_event.c b/present/present_event.c
index 0c1855ec4..59945cf3e 100644
--- a/present/present_event.c
+++ b/present/present_event.c
@@ -21,7 +21,7 @@
  */
 #include <dix-config.h>
 
-#include "Xext/geext.h"
+#include "Xext/geext_priv.h"
 
 #include "present_priv.h"