From 11fe7c5654f025bd626c4998c135d5836c1c8711 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 28 Jun 2024 20:17:48 +0200 Subject: [PATCH] (submit/miext-extinit) miext: move over extinit_priv.h from include Since most of the extension init logic (and on/off switches for them) is driven from miext, this seems the appropriate place for the header. Signed-off-by: Enrico Weigelt, metux IT consult --- Xext/bigreq.c | 2 +- Xext/dpms.c | 6 ++++-- Xext/geext.c | 7 +++++-- Xext/panoramiX.c | 2 +- Xext/saver.c | 2 +- Xext/security.c | 3 +-- Xext/shape.c | 2 +- Xext/shm.c | 2 +- Xext/sync.c | 3 +-- Xext/xcmisc.c | 9 +++++---- Xext/xf86bigfont.c | 3 ++- Xext/xres.c | 2 +- Xext/xselinux_ext.c | 2 +- Xext/xtest.c | 2 +- Xext/xvmain.c | 2 +- Xext/xvmc.c | 10 +++++----- Xi/extinit.c | 2 +- composite/compext.c | 3 ++- damageext/damageext.c | 2 +- dbe/dbe.c | 2 +- dix/dispatch.c | 1 + dri3/dri3.c | 4 +++- glx/glxdricommon.c | 4 +++- glx/vndext.c | 2 +- hw/xnest/Args.c | 2 +- hw/xnest/Init.c | 2 +- hw/xquartz/X11Application.m | 2 +- hw/xquartz/darwin.c | 2 +- hw/xquartz/xpr/dri.c | 4 +++- hw/xquartz/xpr/xprScreen.c | 2 +- hw/xwayland/xwayland-screen.c | 2 +- hw/xwin/InitOutput.c | 4 +--- mi/miinitext.c | 3 ++- {include => miext}/extinit_priv.h | 0 os/utils.c | 2 +- present/present_screen.c | 2 +- pseudoramiX/pseudoramiX.c | 3 ++- randr/randr.c | 3 ++- record/record.c | 2 +- render/render.c | 2 +- test/xi2/protocol-common.c | 2 +- test/xi2/protocol-xigetselectedevents.c | 2 +- test/xi2/protocol-xiquerydevice.c | 4 +++- test/xi2/protocol-xiqueryversion.c | 2 +- test/xi2/protocol-xiselectevents.c | 4 +++- test/xi2/protocol-xisetclientpointer.c | 4 +++- test/xtest.c | 2 +- xfixes/xfixes.c | 3 ++- xkb/xkb.c | 2 +- 49 files changed, 81 insertions(+), 60 deletions(-) rename {include => miext}/extinit_priv.h (100%) diff --git a/Xext/bigreq.c b/Xext/bigreq.c index 3a63c74f2..c364b692a 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -35,13 +35,13 @@ from The Open Group. #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "opaque.h" -#include "extinit_priv.h" static int ProcBigReqDispatch(ClientPtr client) diff --git a/Xext/dpms.c b/Xext/dpms.c index efafca074..78a43b96b 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -32,14 +32,16 @@ Equipment Corporation. #include #include +#include + +#include "miext/extinit_priv.h" + #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "opaque.h" -#include #include "dpmsproc.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 c4e213a8d..22d553899 100644 --- a/Xext/geext.c +++ b/Xext/geext.c @@ -26,13 +26,16 @@ #ifdef HAVE_DIX_CONFIG_H #include #endif -#include "windowstr.h" + #include +#include "windowstr.h" + +#include "miext/extinit_priv.h" + #include "geint.h" #include "geext.h" #include "protocol-versions.h" -#include "extinit_priv.h" DevPrivateKeyRec GEClientPrivateKeyRec; diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 0ae6e8765..5d61c7e86 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -34,6 +34,7 @@ Equipment Corporation. #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "misc.h" #include "cursor.h" @@ -57,7 +58,6 @@ Equipment Corporation. #ifdef COMPOSITE #include "compint.h" #endif -#include "extinit_priv.h" #include "protocol-versions.h" #ifdef GLXPROXY diff --git a/Xext/saver.c b/Xext/saver.c index 1356d6f4b..b5623042c 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -36,6 +36,7 @@ in this Software without prior written authorization from the X Consortium. #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "misc.h" #include "os.h" @@ -59,7 +60,6 @@ in this Software without prior written authorization from the X Consortium. #include "dpmsproc.h" #endif #include "protocol-versions.h" -#include "extinit_priv.h" Bool noScreenSaverExtension = FALSE; diff --git a/Xext/security.c b/Xext/security.c index db4ba0c42..8d5f61d32 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group. #include "dix/dix_priv.h" #include "dix/registry_priv.h" -#include "include/extinit_priv.h" +#include "miext/extinit_priv.h" #include "os/audit.h" #include "os/auth.h" @@ -46,7 +46,6 @@ in this Software without prior written authorization from The Open Group. #include "privates.h" #include "xacestr.h" #include "securitysrv.h" -#include "extinit_priv.h" #include "protocol-versions.h" Bool noSecurityExtension = FALSE; diff --git a/Xext/shape.c b/Xext/shape.c index 88911061b..881e66c42 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -35,6 +35,7 @@ in this Software without prior written authorization from The Open Group. #include "dix/dix_priv.h" #include "dix/gc_priv.h" +#include "miext/extinit_priv.h" #include "misc.h" #include "os.h" @@ -47,7 +48,6 @@ in this Software without prior written authorization from The Open Group. #include "opaque.h" #include "regionstr.h" #include "gcstruct.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 bd3ad1b66..d5ff1245b 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -45,6 +45,7 @@ in this Software without prior written authorization from The Open Group. #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "os/auth.h" #include "os/busfault.h" #include "os/osdep.h" @@ -61,7 +62,6 @@ in this Software without prior written authorization from The Open Group. #include "servermd.h" #include "shmint.h" #include "xace.h" -#include "extinit_priv.h" #include "protocol-versions.h" /* Needed for Solaris cross-zone shared memory extension */ diff --git a/Xext/sync.c b/Xext/sync.c index da9a87ac3..a05bdc35f 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -61,6 +61,7 @@ PERFORMANCE OF THIS SOFTWARE. #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "scrnintstr.h" #include "os.h" @@ -78,8 +79,6 @@ PERFORMANCE OF THIS SOFTWARE. #include #endif -#include "extinit_priv.h" - /* * Local Global Variables */ diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index fad019d0b..9ca82ef4d 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -30,17 +30,18 @@ from The Open Group. #include #endif +#include #include #include +#include + +#include "miext/extinit_priv.h" + #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "swaprep.h" -#include -#include "extinit_priv.h" - -#include static int ProcXCMiscGetVersion(ClientPtr client) diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index f096324b7..014840a98 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -60,13 +60,14 @@ #include #include +#include "miext/extinit_priv.h" + #include "misc.h" #include "os.h" #include "dixstruct.h" #include "gcstruct.h" #include "dixfontstr.h" #include "extnsionst.h" -#include "extinit_priv.h" #include "protocol-versions.h" #include "xf86bigfontsrv.h" diff --git a/Xext/xres.c b/Xext/xres.c index 4ec4d4971..b54bf99ed 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -14,6 +14,7 @@ #include #include "dix/registry_priv.h" +#include "miext/extinit_priv.h" #include "misc.h" #include "os.h" @@ -23,7 +24,6 @@ #include "pixmapstr.h" #include "windowstr.h" #include "gcstruct.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 04913b141..d129f47ca 100644 --- a/Xext/xselinux_ext.c +++ b/Xext/xselinux_ext.c @@ -22,13 +22,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #endif #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "selection.h" #include "inputstr.h" #include "windowstr.h" #include "propertyst.h" #include "extnsionst.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 757399b8d..08d2238b3 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -39,6 +39,7 @@ #include "dix/dix_priv.h" #include "dix/exevents_priv.h" +#include "miext/extinit_priv.h" #include "os/osdep.h" #include "misc.h" @@ -58,7 +59,6 @@ #include "xserver-properties.h" #include "eventstr.h" #include "inpututils.h" -#include "extinit_priv.h" Bool noTestExtensions = FALSE; diff --git a/Xext/xvmain.c b/Xext/xvmain.c index a0576a668..61762b004 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -83,6 +83,7 @@ SOFTWARE. #include #include +#include "miext/extinit_priv.h" #include "Xext/xvdix_priv.h" #include "misc.h" @@ -92,7 +93,6 @@ SOFTWARE. #include "pixmapstr.h" #include "gcstruct.h" #include "extnsionst.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 22856af56..4471ac211 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -5,8 +5,13 @@ #include #include +#include #include +#include +#include +#include +#include "miext/extinit_priv.h" #include "Xext/xvdix_priv.h" #include "misc.h" @@ -15,12 +20,7 @@ #include "resource.h" #include "scrnintstr.h" #include "extnsionst.h" -#include "extinit_priv.h" #include "servermd.h" -#include -#include -#include -#include #include "xvmcext.h" #include "protocol-versions.h" diff --git a/Xi/extinit.c b/Xi/extinit.c index 629696e26..ff0232567 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -62,13 +62,13 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/exevents_priv.h" +#include "miext/extinit_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 "dixevents.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 68c60ac68..3b79be27e 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -45,10 +45,11 @@ #include #endif +#include "miext/extinit_priv.h" + #include "compint.h" #include "xace.h" #include "protocol-versions.h" -#include "extinit_priv.h" Bool noCompositeExtension = FALSE; diff --git a/damageext/damageext.c b/damageext/damageext.c index 192d2e562..b4d5cb7d3 100644 --- a/damageext/damageext.c +++ b/damageext/damageext.c @@ -26,11 +26,11 @@ #endif #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "damageextint.h" #include "damagestr.h" #include "protocol-versions.h" -#include "extinit_priv.h" #include "dixstruct_priv.h" #ifdef PANORAMIX diff --git a/dbe/dbe.c b/dbe/dbe.c index 8a561f2b7..c21c47244 100644 --- a/dbe/dbe.c +++ b/dbe/dbe.c @@ -42,10 +42,10 @@ #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "scrnintstr.h" #include "extnsionst.h" -#include "extinit_priv.h" #include "gcstruct.h" #include "dixstruct.h" #include "dbestruct.h" diff --git a/dix/dispatch.c b/dix/dispatch.c index 95737ab7a..23d719b67 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -110,6 +110,7 @@ Equipment Corporation. #include "dix/registry_priv.h" #include "dix/screenint_priv.h" #include "include/resource.h" +#include "miext/extinit_priv.h" #include "os/auth.h" #include "os/ddx_priv.h" #include "os/osdep.h" diff --git a/dri3/dri3.c b/dri3/dri3.c index 0ea01bb2f..1d8a59502 100644 --- a/dri3/dri3.c +++ b/dri3/dri3.c @@ -19,9 +19,11 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ +#include + +#include "miext/extinit_priv.h" #include "dri3_priv.h" -#include "extinit_priv.h" #include static int dri3_request; diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c index c66e29e62..79cc4da1f 100644 --- a/glx/glxdricommon.c +++ b/glx/glxdricommon.c @@ -35,8 +35,10 @@ #include #include #include + +#include "miext/extinit_priv.h" + #include -#include "extinit_priv.h" #include "glxserver.h" #include "glxext.h" #include "glxcontext.h" diff --git a/glx/vndext.c b/glx/vndext.c index b424dadb0..4fbf5d45b 100644 --- a/glx/vndext.c +++ b/glx/vndext.c @@ -35,12 +35,12 @@ #include #include #include -#include "extinit_priv.h" #include #include "vndservervendor.h" #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" Bool noGlxExtension = FALSE; diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index 8cf82e69e..b2a357562 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -17,7 +17,7 @@ is" without express or implied warranty. #include #include -#include "include/extinit_priv.h" +#include "miext/extinit_priv.h" #include "os/ddx_priv.h" #include "screenint.h" diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index f7c7a5b35..7bf68e415 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -19,6 +19,7 @@ is" without express or implied warranty. #include #include "dix/screenint_priv.h" +#include "miext/extinit_priv.h" #include "os/ddx_priv.h" #include "os/osdep.h" @@ -30,7 +31,6 @@ is" without express or implied warranty. #include "servermd.h" #include "mi.h" #include "dixfontstr.h" -#include "extinit_priv.h" #include "xnest-xcb.h" #include "Display.h" diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index 70648eb30..1edabd727 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -37,7 +37,7 @@ #import "X11Application.h" #import "NSUserDefaults+XQuartzDefaults.h" -#include "include/extinit_priv.h" +#include "miext/extinit_priv.h" #include "darwin.h" #include "quartz.h" diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 42f33602e..f4850c5a3 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -36,6 +36,7 @@ #include #include +#include "miext/extinit_priv.h" #include "os/ddx_priv.h" #include "os/osdep.h" @@ -53,7 +54,6 @@ #include #include #include "exevents.h" -#include "extinit_priv.h" #include "glx_extinit.h" #include "xserver-properties.h" diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c index 73ad601a6..d9dd275f6 100644 --- a/hw/xquartz/xpr/dri.c +++ b/hw/xquartz/xpr/dri.c @@ -47,10 +47,12 @@ #include #include #include + +#include "miext/extinit_priv.h" + #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" -#include "extinit_priv.h" #include "colormapst.h" #include "cursorstr.h" #include "scrnintstr.h" diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c index 81de33769..07bc98cf0 100644 --- a/hw/xquartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -54,7 +54,7 @@ #endif #include "nonsdk_extinit.h" -#include "extinit_priv.h" +#include "miext/extinit_priv.h" /* 10.4's deferred update makes X slower.. have to live with the tearing * for now.. */ diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c index f53d66465..62acff9a5 100644 --- a/hw/xwayland/xwayland-screen.c +++ b/hw/xwayland/xwayland-screen.c @@ -37,7 +37,7 @@ #include #include -#include "include/extinit_priv.h" +#include "miext/extinit_priv.h" #include "os/osdep.h" #include "os/xserver_poll.h" diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 541503552..50b5baa48 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -36,6 +36,7 @@ from The Open Group. #include "dix/dix_priv.h" #include "dix/screenint_priv.h" +#include "miext/extinit_priv.h" #include "os/ddx_priv.h" #include "os/osdep.h" @@ -65,11 +66,8 @@ typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner, #include "winmonitors.h" #include "nonsdk_extinit.h" -#include "extinit_priv.h" #include "pseudoramiX/pseudoramiX.h" -#include "dix/dix_priv.h" - #include "glx_extinit.h" #ifdef XWIN_GLX_WINDOWS #include "glx/glwindows.h" diff --git a/mi/miinitext.c b/mi/miinitext.c index 5a8a86059..98bc1a58f 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -77,9 +77,10 @@ SOFTWARE. #include "xf86Extensions.h" #endif +#include "miext/extinit_priv.h" + #include "misc.h" #include "extension.h" -#include "extinit_priv.h" #include "micmap.h" #include "os.h" #include "globals.h" diff --git a/include/extinit_priv.h b/miext/extinit_priv.h similarity index 100% rename from include/extinit_priv.h rename to miext/extinit_priv.h diff --git a/os/utils.c b/os/utils.c index a4d5beba1..e35614fc1 100644 --- a/os/utils.c +++ b/os/utils.c @@ -106,7 +106,7 @@ __stdcall unsigned long GetTickCount(void); #endif #include "dix/dix_priv.h" -#include "include/extinit_priv.h" +#include "miext/extinit_priv.h" #include "os/auth.h" #include "os/cmdline.h" #include "os/ddx_priv.h" diff --git a/present/present_screen.c b/present/present_screen.c index e630dae76..fa1f20186 100644 --- a/present/present_screen.c +++ b/present/present_screen.c @@ -22,7 +22,7 @@ #include "present_priv.h" -#include "extinit_priv.h" +#include "miext/extinit_priv.h" int present_request; DevPrivateKeyRec present_screen_private_key; diff --git a/pseudoramiX/pseudoramiX.c b/pseudoramiX/pseudoramiX.c index 40e4cf12e..230a7eef3 100644 --- a/pseudoramiX/pseudoramiX.c +++ b/pseudoramiX/pseudoramiX.c @@ -39,10 +39,11 @@ #include +#include "miext/extinit_priv.h" + #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 6fbe5d3b7..d462727a5 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -30,8 +30,9 @@ #include #endif +#include "miext/extinit_priv.h" + #include "randrstr_priv.h" -#include "extinit_priv.h" /* From render.h */ #ifndef SubPixelUnknown diff --git a/record/record.c b/record/record.c index 64a6d4ddc..e0afcba85 100644 --- a/record/record.c +++ b/record/record.c @@ -37,10 +37,10 @@ and Jim Haggerty of Metheus. #endif #include "dix/eventconvert.h" +#include "miext/extinit_priv.h" #include "dixstruct.h" #include "extnsionst.h" -#include "extinit_priv.h" #include #include "set.h" #include "swaprep.h" diff --git a/render/render.c b/render/render.c index 9ab9e5b17..4c72f0da5 100644 --- a/render/render.c +++ b/render/render.c @@ -33,6 +33,7 @@ #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "misc.h" #include "os.h" @@ -43,7 +44,6 @@ #include "pixmapstr.h" #include "colormapst.h" #include "extnsionst.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 aae84180a..120274a59 100644 --- a/test/xi2/protocol-common.c +++ b/test/xi2/protocol-common.c @@ -34,8 +34,8 @@ #include "dix/dix_priv.h" #include "dix/exevents_priv.h" +#include "miext/extinit_priv.h" -#include "extinit_priv.h" #include "exglobals.h" #include "xkbsrv.h" /* for XkbInitPrivates */ #include "xserver-properties.h" diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c index 12e948121..3e3f05fef 100644 --- a/test/xi2/protocol-xigetselectedevents.c +++ b/test/xi2/protocol-xigetselectedevents.c @@ -45,10 +45,10 @@ #include #include "dix/exevents_priv.h" +#include "miext/extinit_priv.h" /* for XInputExtensionInit */ #include "inputstr.h" #include "windowstr.h" -#include "extinit_priv.h" /* for XInputExtensionInit */ #include "scrnintstr.h" #include "xiselectev.h" diff --git a/test/xi2/protocol-xiquerydevice.c b/test/xi2/protocol-xiquerydevice.c index 7ee0b1f07..f368c62b0 100644 --- a/test/xi2/protocol-xiquerydevice.c +++ b/test/xi2/protocol-xiquerydevice.c @@ -33,8 +33,10 @@ #include #include #include + +#include "miext/extinit_priv.h" + #include "inputstr.h" -#include "extinit_priv.h" #include "exglobals.h" #include "scrnintstr.h" #include "xkbsrv.h" diff --git a/test/xi2/protocol-xiqueryversion.c b/test/xi2/protocol-xiqueryversion.c index 4538588c9..a6a4b54d9 100644 --- a/test/xi2/protocol-xiqueryversion.c +++ b/test/xi2/protocol-xiqueryversion.c @@ -45,9 +45,9 @@ #include #include "dix/exevents_priv.h" +#include "miext/extinit_priv.h" /* for XInputExtensionInit */ #include "inputstr.h" -#include "extinit_priv.h" /* for XInputExtensionInit */ #include "scrnintstr.h" #include "xiqueryversion.h" #include "protocol-common.h" diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c index ee02e1761..87282d0d3 100644 --- a/test/xi2/protocol-xiselectevents.c +++ b/test/xi2/protocol-xiselectevents.c @@ -54,9 +54,11 @@ #include #include #include + +#include "miext/extinit_priv.h" /* for XInputExtensionInit */ + #include "inputstr.h" #include "windowstr.h" -#include "extinit_priv.h" /* for XInputExtensionInit */ #include "scrnintstr.h" #include "exglobals.h" #include "xiselectev.h" diff --git a/test/xi2/protocol-xisetclientpointer.c b/test/xi2/protocol-xisetclientpointer.c index fa52941d6..d3e388fbf 100644 --- a/test/xi2/protocol-xisetclientpointer.c +++ b/test/xi2/protocol-xisetclientpointer.c @@ -41,9 +41,11 @@ #include #include #include + +#include "miext/extinit_priv.h" /* for XInputExtensionInit */ + #include "inputstr.h" #include "windowstr.h" -#include "extinit_priv.h" /* for XInputExtensionInit */ #include "scrnintstr.h" #include "xisetclientpointer.h" #include "exevents.h" diff --git a/test/xtest.c b/test/xtest.c index 1dc7078b1..54a50e256 100644 --- a/test/xtest.c +++ b/test/xtest.c @@ -31,13 +31,13 @@ #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "input.h" #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" #include "exevents.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 68888448a..7dfb762cb 100644 --- a/xfixes/xfixes.c +++ b/xfixes/xfixes.c @@ -46,9 +46,10 @@ #include #endif +#include "miext/extinit_priv.h" + #include "xfixesint.h" #include "protocol-versions.h" -#include "extinit_priv.h" Bool noXFixesExtension = FALSE; diff --git a/xkb/xkb.c b/xkb/xkb.c index 575bd0fa9..fe5a1fcb9 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -35,12 +35,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "misc.h" #include "inputstr.h" #include #include "extnsionst.h" -#include "extinit_priv.h" #include "xace.h" #include "xkb-procs.h" #include "protocol-versions.h"