include: move private definitions out of extinit.h

Public server module API shouldn't be clobbered with private definitions,
thus move them out to extinit_priv.h.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1289>

Xext/bigreq.c

@@ -41,7 +41,7 @@ from The Open Group.
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "opaque.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 
 static int
 ProcBigReqDispatch(ClientPtr client)

Xext/dpms.c

@@ -39,7 +39,7 @@ Equipment Corporation.
 #include "opaque.h"
 #include <X11/extensions/dpmsproto.h>
 #include "dpmsproc.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "protocol-versions.h"

Xext/geext.c

@@ -32,7 +32,7 @@
 #include "geint.h"
 #include "geext.h"
 #include "protocol-versions.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 
 DevPrivateKeyRec GEClientPrivateKeyRec;
 

Xext/panoramiX.c

@@ -57,7 +57,7 @@ Equipment Corporation.
 #ifdef COMPOSITE
 #include "compint.h"
 #endif
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "protocol-versions.h"
 
 #ifdef GLXPROXY

Xext/saver.c

@@ -60,7 +60,7 @@ in this Software without prior written authorization from the X Consortium.
 #include "dpmsproc.h"
 #endif
 #include "protocol-versions.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 
 static int ScreenSaverEventBase = 0;
 

Xext/shape.c

@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
 #include "opaque.h"
 #include "regionstr.h"
 #include "gcstruct.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "protocol-versions.h"
 
 typedef RegionPtr (*CreateDftPtr) (WindowPtr    /* pWin */

Xext/shm.c

@@ -41,7 +41,10 @@ in this Software without prior written authorization from The Open Group.
 #include <fcntl.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/shmproto.h>
+#include <X11/Xfuncproto.h>
 
+#include "dix/dix_priv.h"
 #include "os/auth.h"
 #include "os/busfault.h"
 #include "os/osdep.h"
@@ -58,9 +61,7 @@ in this Software without prior written authorization from The Open Group.
 #include "servermd.h"
 #include "shmint.h"
 #include "xace.h"
-#include <X11/extensions/shmproto.h>
-#include <X11/Xfuncproto.h>
-#include <sys/mman.h>
+#include "extinit_priv.h"
 #include "protocol-versions.h"
 
 /* Needed for Solaris cross-zone shared memory extension */
@@ -95,10 +96,6 @@ in this Software without prior written authorization from The Open Group.
 #include "panoramiXsrv.h"
 #endif
 
-#include "dix/dix_priv.h"
-
-#include "extinit.h"
-
 typedef struct _ShmScrPrivateRec {
     CloseScreenProcPtr CloseScreen;
     ShmFuncsPtr shmFuncs;

Xext/sync.c

@@ -79,7 +79,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <sys/time.h>
 #endif
 
-#include "extinit.h"
+#include "extinit_priv.h"
 
 /*
  * Local Global Variables

Xext/xcmisc.c

@@ -38,7 +38,7 @@ from The Open Group.
 #include "extnsionst.h"
 #include "swaprep.h"
 #include <X11/extensions/xcmiscproto.h>
-#include "extinit.h"
+#include "extinit_priv.h"
 
 #include <stdint.h>
 

Xext/xres.c

@@ -23,7 +23,7 @@
 #include "pixmapstr.h"
 #include "windowstr.h"
 #include "gcstruct.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "protocol-versions.h"
 #include "client.h"
 #include "list.h"

Xext/xselinux_ext.c

@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "windowstr.h"
 #include "propertyst.h"
 #include "extnsionst.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "xselinuxint.h"
 
 #define CTX_DEV offsetof(SELinuxSubjectRec, dev_create_sid)

Xext/xtest.c

@@ -58,7 +58,7 @@
 #include "exevents.h"
 #include "eventstr.h"
 #include "inpututils.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 
 /* XTest events are sent during request processing and may be interrupted by
  * a SIGIO. We need a separate event list to avoid events overwriting each

Xext/xvmain.c

@@ -88,7 +88,7 @@ SOFTWARE.
 #include "pixmapstr.h"
 #include "gcstruct.h"
 #include "extnsionst.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"

Xext/xvmc.c

@@ -13,7 +13,7 @@
 #include "resource.h"
 #include "scrnintstr.h"
 #include "extnsionst.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "servermd.h"
 #include <X11/Xfuncproto.h>
 #include "xvdix.h"

Xi/extinit.c

@@ -68,7 +68,7 @@ SOFTWARE.
 #include "geext.h"              /* extension interfaces for ge */
 #include "dixevents.h"
 #include "exevents.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "exglobals.h"
 #include "swaprep.h"
 #include "privates.h"

composite/compext.c

@@ -48,7 +48,7 @@
 #include "compint.h"
 #include "xace.h"
 #include "protocol-versions.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 
 static CARD8 CompositeReqCode;
 static DevPrivateKeyRec CompositeClientPrivateKeyRec;

damageext/damageext.c

@@ -30,7 +30,7 @@
 #include "damageextint.h"
 #include "damagestr.h"
 #include "protocol-versions.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "dixstruct_priv.h"
 
 #ifdef PANORAMIX

dbe/dbe.c

@@ -45,7 +45,7 @@
 
 #include "scrnintstr.h"
 #include "extnsionst.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "gcstruct.h"
 #include "dixstruct.h"
 #include "dbestruct.h"

dri3/dri3.c

@@ -21,7 +21,7 @@
  */
 
 #include "dri3_priv.h"
-
+#include "extinit_priv.h"
 #include <drm_fourcc.h>
 
 static int dri3_request;

glx/vndext.c

@@ -35,6 +35,7 @@
 #include <dixstruct.h>
 #include <extnsionst.h>
 #include <glx_extinit.h>
+#include "extinit_priv.h"
 
 #include <GL/glxproto.h>
 #include "vndservervendor.h"

hw/xnest/Init.c

@@ -32,7 +32,7 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "mi.h"
 #include "dixfontstr.h"
-
+#include "extinit_priv.h"
 #include "Xnest.h"
 
 #include "Display.h"

hw/xquartz/xpr/xprScreen.c

@@ -54,6 +54,7 @@
 #endif
 
 #include "nonsdk_extinit.h"
+#include "extinit_priv.h"
 
 /* 10.4's deferred update makes X slower.. have to live with the tearing
  * for now.. */

hw/xwin/InitOutput.c

@@ -65,6 +65,7 @@ typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner,
 
 #include "winmonitors.h"
 #include "nonsdk_extinit.h"
+#include "extinit_priv.h"
 #include "pseudoramiX/pseudoramiX.h"
 
 #include "glx_extinit.h"

include/extinit.h

@@ -55,107 +55,64 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef COMPOSITE
 extern _X_EXPORT Bool noCompositeExtension;
-extern void CompositeExtensionInit(void);
 #endif
 
 #ifdef DAMAGE
 extern _X_EXPORT Bool noDamageExtension;
-extern void DamageExtensionInit(void);
 #endif
 
 #if defined(DBE)
 extern _X_EXPORT Bool noDbeExtension;
-extern void DbeExtensionInit(void);
 #endif
 
 #if defined(DPMSExtension)
 extern _X_EXPORT Bool noDPMSExtension;
-extern void DPMSExtensionInit(void);
 #endif
 
-extern Bool noGEExtension;
-extern void GEExtensionInit(void);
-
 #ifdef GLXEXT
 extern _X_EXPORT Bool noGlxExtension;
-extern void GlxExtensionInit(void);
 #endif
 
 #ifdef PANORAMIX
 extern _X_EXPORT Bool noPanoramiXExtension;
-extern void PanoramiXExtensionInit(void);
 #endif
 
 #ifdef RANDR
 extern _X_EXPORT Bool noRRExtension;
-extern void RRExtensionInit(void);
-#endif
-
-#if defined(XRECORD)
-extern void RecordExtensionInit(void);
 #endif
 
 extern _X_EXPORT Bool noRenderExtension;
-extern void RenderExtensionInit(void);
 
 #if defined(RES)
 extern _X_EXPORT Bool noResExtension;
-extern void ResExtensionInit(void);
 #endif
 
 #if defined(SCREENSAVER)
 extern _X_EXPORT Bool noScreenSaverExtension;
-extern void ScreenSaverExtensionInit(void);
 #endif
 
 extern _X_EXPORT Bool noShapeExtension;
-extern void ShapeExtensionInit(void);
 
 #ifdef MITSHM
 extern _X_EXPORT Bool noMITShmExtension;
-extern void ShmExtensionInit(void);
 #endif
 
-extern void SyncExtensionInit(void);
-
-extern void XCMiscExtensionInit(void);
-
 #ifdef XCSECURITY
 extern _X_EXPORT Bool noSecurityExtension;
-extern void SecurityExtensionInit(void);
 #endif
 
 #ifdef XF86BIGFONT
 extern _X_EXPORT Bool noXFree86BigfontExtension;
-extern void XFree86BigfontExtensionInit(void);
 #endif
 
-extern void BigReqExtensionInit(void);
-
 extern _X_EXPORT Bool noXFixesExtension;
-extern void XFixesExtensionInit(void);
-
-extern void XInputExtensionInit(void);
-
-extern void XkbExtensionInit(void);
 
 #if defined(XSELINUX)
 extern _X_EXPORT Bool noSELinuxExtension;
-extern void SELinuxExtensionInit(void);
-#endif
-
-#ifdef XTEST
-extern void XTestExtensionInit(void);
 #endif
 
 #if defined(XV)
 extern _X_EXPORT Bool noXvExtension;
-extern void XvExtensionInit(void);
-extern void XvMCExtensionInit(void);
-#endif
-
-#if defined(DRI3)
-extern void dri3_extension_init(void);
 #endif
 
 #if defined(PRESENT)

include/extinit_priv.h

@@ -0,0 +1,42 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 1996 Thomas E. Dickey <dickey@clark.net>
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_EXTINIT_PRIV_H
+#define _XSERVER_EXTINIT_PRIV_H
+
+#include "extinit.h"
+
+extern Bool noGEExtension;
+
+void CompositeExtensionInit(void);
+void DamageExtensionInit(void);
+void DbeExtensionInit(void);
+void DPMSExtensionInit(void);
+void GEExtensionInit(void);
+void GlxExtensionInit(void);
+void PanoramiXExtensionInit(void);
+void RRExtensionInit(void);
+void RecordExtensionInit(void);
+void RenderExtensionInit(void);
+void ResExtensionInit(void);
+void ScreenSaverExtensionInit(void);
+void ShapeExtensionInit(void);
+void ShmExtensionInit(void);
+void SyncExtensionInit(void);
+void XCMiscExtensionInit(void);
+void SecurityExtensionInit(void);
+void XFree86BigfontExtensionInit(void);
+void BigReqExtensionInit(void);
+void XFixesExtensionInit(void);
+void XInputExtensionInit(void);
+void XkbExtensionInit(void);
+void SELinuxExtensionInit(void);
+void XTestExtensionInit(void);
+void XvExtensionInit(void);
+void XvMCExtensionInit(void);
+void dri3_extension_init(void);
+void PseudoramiXExtensionInit(void);
+
+#endif /* _XSERVER_EXTINIT_PRIV_H */

include/nonsdk_extinit.h

@@ -30,6 +30,5 @@ DEALINGS IN THE SOFTWARE.
    pulled in by sdksyms */
 
 extern _X_EXPORT Bool noPseudoramiXExtension;
-extern void PseudoramiXExtensionInit(void);
 
 #endif

mi/miinitext.c

@@ -88,7 +88,7 @@ SOFTWARE.
 
 #include "misc.h"
 #include "extension.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "micmap.h"
 #include "os.h"
 #include "globals.h"

pseudoramiX/pseudoramiX.c

@@ -40,6 +40,7 @@
 #include "pseudoramiX.h"
 #include "extnsionst.h"
 #include "nonsdk_extinit.h"
+#include "extinit_priv.h"
 #include "dixstruct.h"
 #include "window.h"
 #include <X11/extensions/panoramiXproto.h>

randr/randr.c

@@ -31,7 +31,7 @@
 #endif
 
 #include "randrstr_priv.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 
 /* From render.h */
 #ifndef SubPixelUnknown

record/record.c

@@ -40,7 +40,7 @@ and Jim Haggerty of Metheus.
 
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include <X11/extensions/recordproto.h>
 #include "set.h"
 #include "swaprep.h"

render/render.c

@@ -43,7 +43,7 @@
 #include "pixmapstr.h"
 #include "colormapst.h"
 #include "extnsionst.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "servermd.h"
 #include "picturestr_priv.h"
 #include "glyphstr_priv.h"

test/xi2/protocol-common.c

@@ -33,7 +33,7 @@
 
 #include "dix/dix_priv.h"
 
-#include "extinit.h"            /* for XInputExtensionInit */
+#include "extinit_priv.h"
 #include "exglobals.h"
 #include "xkbsrv.h"             /* for XkbInitPrivates */
 #include "xserver-properties.h"

test/xtest.c

@@ -37,7 +37,7 @@
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "exevents.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "xkbsrv.h"
 #include "xserver-properties.h"
 #include "syncsrv.h"

xfixes/xfixes.c

@@ -48,7 +48,7 @@
 
 #include "xfixesint.h"
 #include "protocol-versions.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 
 static unsigned char XFixesReqCode;
 int XFixesEventBase;

xkb/xkb.c

@@ -40,7 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include <xkbsrv.h>
 #include "extnsionst.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "xace.h"
 #include "xkb-procs.h"
 #include "protocol-versions.h"