From 33350ef8ff1f2e4daed332db2b67b8f20e09d5ea Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 12 Feb 2024 14:11:52 +0100 Subject: [PATCH] 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 Part-of: --- Xext/bigreq.c | 2 +- Xext/dpms.c | 2 +- Xext/geext.c | 2 +- Xext/panoramiX.c | 2 +- Xext/saver.c | 2 +- Xext/shape.c | 2 +- Xext/shm.c | 11 ++++------ Xext/sync.c | 2 +- Xext/xcmisc.c | 2 +- Xext/xres.c | 2 +- Xext/xselinux_ext.c | 2 +- Xext/xtest.c | 2 +- Xext/xvmain.c | 2 +- Xext/xvmc.c | 2 +- Xi/extinit.c | 2 +- composite/compext.c | 2 +- damageext/damageext.c | 2 +- dbe/dbe.c | 2 +- dri3/dri3.c | 2 +- glx/vndext.c | 1 + hw/xnest/Init.c | 2 +- hw/xquartz/xpr/xprScreen.c | 1 + hw/xwin/InitOutput.c | 1 + include/extinit.h | 43 -------------------------------------- include/extinit_priv.h | 42 +++++++++++++++++++++++++++++++++++++ include/nonsdk_extinit.h | 1 - mi/miinitext.c | 2 +- pseudoramiX/pseudoramiX.c | 1 + randr/randr.c | 2 +- record/record.c | 2 +- render/render.c | 2 +- test/xi2/protocol-common.c | 2 +- test/xtest.c | 2 +- xfixes/xfixes.c | 2 +- xkb/xkb.c | 2 +- 35 files changed, 77 insertions(+), 78 deletions(-) create mode 100644 include/extinit_priv.h diff --git a/Xext/bigreq.c b/Xext/bigreq.c index aca5afb96..0dc60c258 100644 --- a/Xext/bigreq.c +++ b/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) diff --git a/Xext/dpms.c b/Xext/dpms.c index bbc7890eb..68759a48a 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -39,7 +39,7 @@ Equipment Corporation. #include "opaque.h" #include #include "dpmsproc.h" -#include "extinit.h" +#include "extinit_priv.h" #include "scrnintstr.h" #include "windowstr.h" #include "protocol-versions.h" diff --git a/Xext/geext.c b/Xext/geext.c index 05988c41a..ac21b7a53 100644 --- a/Xext/geext.c +++ b/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; diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 94c81a7c8..732e983ba 100644 --- a/Xext/panoramiX.c +++ b/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 diff --git a/Xext/saver.c b/Xext/saver.c index 29f280369..e6dddbb03 100644 --- a/Xext/saver.c +++ b/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; diff --git a/Xext/shape.c b/Xext/shape.c index 792c20f71..213e7cc3f 100644 --- a/Xext/shape.c +++ b/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 */ diff --git a/Xext/shm.c b/Xext/shm.c index 7e6071215..427cf1b4e 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -41,7 +41,10 @@ in this Software without prior written authorization from The Open Group. #include #include #include +#include +#include +#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 -#include -#include +#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; diff --git a/Xext/sync.c b/Xext/sync.c index 950951e74..a37444bb0 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -79,7 +79,7 @@ PERFORMANCE OF THIS SOFTWARE. #include #endif -#include "extinit.h" +#include "extinit_priv.h" /* * Local Global Variables diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index c3c0b7f43..385e63383 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -38,7 +38,7 @@ from The Open Group. #include "extnsionst.h" #include "swaprep.h" #include -#include "extinit.h" +#include "extinit_priv.h" #include diff --git a/Xext/xres.c b/Xext/xres.c index 96c1844fd..9d71402f1 100644 --- a/Xext/xres.c +++ b/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" diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c index c7ce19c49..5bfb9a84b 100644 --- a/Xext/xselinux_ext.c +++ b/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) diff --git a/Xext/xtest.c b/Xext/xtest.c index 96f898656..8fb580927 100644 --- a/Xext/xtest.c +++ b/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 diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 2a08f8744..937f2893b 100644 --- a/Xext/xvmain.c +++ b/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" diff --git a/Xext/xvmc.c b/Xext/xvmc.c index a1fb6238b..04023772d 100644 --- a/Xext/xvmc.c +++ b/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 #include "xvdix.h" diff --git a/Xi/extinit.c b/Xi/extinit.c index 7c08f3a8a..e99da9ce6 100644 --- a/Xi/extinit.c +++ b/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" diff --git a/composite/compext.c b/composite/compext.c index cfdb7a216..62bce26e7 100644 --- a/composite/compext.c +++ b/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; diff --git a/damageext/damageext.c b/damageext/damageext.c index 76609fb6b..6a46291fd 100644 --- a/damageext/damageext.c +++ b/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 diff --git a/dbe/dbe.c b/dbe/dbe.c index 3cf0a3ef9..b9f6690a6 100644 --- a/dbe/dbe.c +++ b/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" diff --git a/dri3/dri3.c b/dri3/dri3.c index f9c517277..0ea01bb2f 100644 --- a/dri3/dri3.c +++ b/dri3/dri3.c @@ -21,7 +21,7 @@ */ #include "dri3_priv.h" - +#include "extinit_priv.h" #include static int dri3_request; diff --git a/glx/vndext.c b/glx/vndext.c index 21ba29269..92b3001a3 100644 --- a/glx/vndext.c +++ b/glx/vndext.c @@ -35,6 +35,7 @@ #include #include #include +#include "extinit_priv.h" #include #include "vndservervendor.h" diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index 58255c22b..194119ff8 100644 --- a/hw/xnest/Init.c +++ b/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" diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c index 562d6a0c3..81de33769 100644 --- a/hw/xquartz/xpr/xprScreen.c +++ b/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.. */ diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 0358b8560..47ec5ba77 100644 --- a/hw/xwin/InitOutput.c +++ b/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" diff --git a/include/extinit.h b/include/extinit.h index 59d18962f..a92aef935 100644 --- a/include/extinit.h +++ b/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) diff --git a/include/extinit_priv.h b/include/extinit_priv.h new file mode 100644 index 000000000..186fe8ad2 --- /dev/null +++ b/include/extinit_priv.h @@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: MIT OR X11 + * + * Copyright © 1996 Thomas E. Dickey + * Copyright © 2024 Enrico Weigelt, metux IT consult + */ +#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 */ diff --git a/include/nonsdk_extinit.h b/include/nonsdk_extinit.h index da8d370bd..dc10df12b 100644 --- a/include/nonsdk_extinit.h +++ b/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 diff --git a/mi/miinitext.c b/mi/miinitext.c index 1ddcd7fda..04f320118 100644 --- a/mi/miinitext.c +++ b/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" diff --git a/pseudoramiX/pseudoramiX.c b/pseudoramiX/pseudoramiX.c index 95f6e10c8..3623fadc7 100644 --- a/pseudoramiX/pseudoramiX.c +++ b/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 diff --git a/randr/randr.c b/randr/randr.c index 2994bcd6c..3cb4cbd39 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -31,7 +31,7 @@ #endif #include "randrstr_priv.h" -#include "extinit.h" +#include "extinit_priv.h" /* From render.h */ #ifndef SubPixelUnknown diff --git a/record/record.c b/record/record.c index 88fbf9c85..b0a7aff15 100644 --- a/record/record.c +++ b/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 #include "set.h" #include "swaprep.h" diff --git a/render/render.c b/render/render.c index af84a0345..d43c4cf4b 100644 --- a/render/render.c +++ b/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" diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c index f193bce45..b985e35b7 100644 --- a/test/xi2/protocol-common.c +++ b/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" diff --git a/test/xtest.c b/test/xtest.c index 1d38f3d47..1dc7078b1 100644 --- a/test/xtest.c +++ b/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" diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c index 3d044f918..69b8241a4 100644 --- a/xfixes/xfixes.c +++ b/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; diff --git a/xkb/xkb.c b/xkb/xkb.c index b324aeaa8..9fd89f730 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -40,7 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include #include "extnsionst.h" -#include "extinit.h" +#include "extinit_priv.h" #include "xace.h" #include "xkb-procs.h" #include "protocol-versions.h"