From 54a13393a1c92923fce1ab1477bd325fc29ad83b 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 | 4 ++-- 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 | 3 +-- hw/xwin/InitOutput.c | 4 +--- mi/miinitext.c | 3 ++- {include => miext}/extinit_priv.h | 0 os/utils.c | 3 +-- 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, 79 insertions(+), 62 deletions(-) rename {include => miext}/extinit_priv.h (100%) diff --git a/Xext/bigreq.c b/Xext/bigreq.c index 2a3012cf7..e087bad51 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -33,13 +33,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 af1869cb2..cadcd1a9a 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -30,7 +30,9 @@ Equipment Corporation. #include #include +#include +#include "miext/extinit_priv.h" #include "os/screensaver.h" #include "misc.h" @@ -38,9 +40,7 @@ Equipment Corporation. #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 0f4076a5f..ac9cfb273 100644 --- a/Xext/geext.c +++ b/Xext/geext.c @@ -24,13 +24,16 @@ */ #include -#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" Bool noGEExtension = FALSE; diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 75f9e37b2..a7adf718f 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -32,6 +32,7 @@ Equipment Corporation. #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "misc.h" #include "cursor.h" @@ -55,7 +56,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 a91bc0aed..a44035985 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 "dix/colormap_priv.h" #include "dix/cursor_priv.h" #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "os/osdep.h" #include "os/screensaver.h" @@ -61,7 +62,6 @@ in this Software without prior written authorization from the X Consortium. #include "dpmsproc.h" #endif #include "protocol-versions.h" -#include "extinit_priv.h" // temporary workaround for win32/mingw32 name clash // see: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1355 diff --git a/Xext/security.c b/Xext/security.c index ff1eff018..0d3343f65 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -32,7 +32,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" #include "os/osdep.h" @@ -45,7 +45,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 7a0634ae2..4cef10d05 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -33,6 +33,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" @@ -45,7 +46,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" Bool noShapeExtension = FALSE; diff --git a/Xext/shm.c b/Xext/shm.c index 8c91747c8..cd922891f 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -43,6 +43,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" @@ -59,7 +60,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 b6417b3b0..8bea2c986 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -59,6 +59,7 @@ PERFORMANCE OF THIS SOFTWARE. #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "os/osdep.h" #include "scrnintstr.h" @@ -77,8 +78,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 dff21efb1..63de8192a 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -28,17 +28,18 @@ from The Open Group. #include +#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 cda997a44..fb0f3e891 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -58,13 +58,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 8526da65d..1be55e71f 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -13,6 +13,7 @@ #include "dix/registry_priv.h" #include "os/client_priv.h" +#include "miext/extinit_priv.h" #include "misc.h" #include "os.h" @@ -22,7 +23,6 @@ #include "pixmapstr.h" #include "windowstr.h" #include "gcstruct.h" -#include "extinit_priv.h" #include "protocol-versions.h" #include "list.h" #include "misc.h" diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c index 407c43570..95fd07fd2 100644 --- a/Xext/xselinux_ext.c +++ b/Xext/xselinux_ext.c @@ -21,13 +21,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "dix/dix_priv.h" #include "dix/property_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 bec191e49..7b9aee730 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -40,6 +40,7 @@ #include "dix/exevents_priv.h" #include "mi/mi_priv.h" #include "mi/mipointer_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 914eaecf3..b6886333a 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -81,6 +81,7 @@ SOFTWARE. #include #include +#include "miext/extinit_priv.h" #include "Xext/xvdix_priv.h" #include "misc.h" @@ -90,7 +91,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 6debaf0ec..6816d8bf4 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -3,8 +3,13 @@ #include #include +#include #include +#include +#include +#include +#include "miext/extinit_priv.h" #include "Xext/xvdix_priv.h" #include "misc.h" @@ -13,12 +18,7 @@ #include "resource.h" #include "scrnintstr.h" #include "extnsionst.h" -#include "extinit_priv.h" #include "servermd.h" -#include -#include -#include -#include #include "xvmcext.h" #ifdef HAS_XVMCSHM diff --git a/Xi/extinit.c b/Xi/extinit.c index f6f21f30d..a665b33cd 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -60,13 +60,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 bb8f5946d..590f8c1a8 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -43,10 +43,11 @@ #include +#include "miext/extinit_priv.h" + #include "compint.h" #include "xace.h" #include "protocol-versions.h" -#include "extinit_priv.h" static CARD8 CompositeReqCode; static DevPrivateKeyRec CompositeClientPrivateKeyRec; diff --git a/damageext/damageext.c b/damageext/damageext.c index 038c24aca..35465642b 100644 --- a/damageext/damageext.c +++ b/damageext/damageext.c @@ -24,11 +24,11 @@ #include #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 XINERAMA diff --git a/dbe/dbe.c b/dbe/dbe.c index 288bc4076..bb6d281d2 100644 --- a/dbe/dbe.c +++ b/dbe/dbe.c @@ -40,10 +40,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 f66bc106f..05466b24c 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -111,6 +111,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/client_priv.h" #include "os/ddx_priv.h" diff --git a/dri3/dri3.c b/dri3/dri3.c index 5ec531fa7..d53fa2547 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 767e43089..115be64fc 100644 --- a/glx/glxdricommon.c +++ b/glx/glxdricommon.c @@ -33,8 +33,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 106526913..2ba5ba2a6 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 94f52764c..8f448babb 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 6f3e047ca..ffa94b075 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -22,6 +22,7 @@ is" without express or implied warranty. #include "dix/screenint_priv.h" #include "mi/mi_priv.h" +#include "miext/extinit_priv.h" #include "os/ddx_priv.h" #include "os/osdep.h" @@ -32,7 +33,6 @@ is" without express or implied warranty. #include "windowstr.h" #include "servermd.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 e7fa0ab23..cb8319af4 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -35,7 +35,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 4440796d0..8b6c3c2ee 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -34,6 +34,7 @@ #include #include +#include "miext/extinit_priv.h" #include "os/ddx_priv.h" #include "os/osdep.h" @@ -51,7 +52,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 79ada1d25..ace54d2d5 100644 --- a/hw/xquartz/xpr/dri.c +++ b/hw/xquartz/xpr/dri.c @@ -45,10 +45,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 f595748ef..f300b28b1 100644 --- a/hw/xquartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -52,7 +52,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 56d891456..96fd7c192 100644 --- a/hw/xwayland/xwayland-screen.c +++ b/hw/xwayland/xwayland-screen.c @@ -39,11 +39,10 @@ #include "dix/input_priv.h" #include "dix/property_priv.h" -#include "include/extinit_priv.h" +#include "miext/extinit_priv.h" #include "os/osdep.h" #include "os/xserver_poll.h" -#include "extinit_priv.h" #include #include #include diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 74775e1e6..2e15460b5 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 67fd33fab..3ce1a6b26 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -91,9 +91,10 @@ SOFTWARE. #undef MITSHM #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 754e5c7f4..bad0cc241 100644 --- a/os/utils.c +++ b/os/utils.c @@ -105,7 +105,7 @@ __stdcall unsigned long GetTickCount(void); #include "dix/dix_priv.h" #include "dix/input_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" @@ -119,7 +119,6 @@ __stdcall unsigned long GetTickCount(void); #include "present.h" #include "dixstruct_priv.h" #include "dpmsproc.h" -#include "extinit_priv.h" #define X_INCLUDE_NETDB_H #include diff --git a/present/present_screen.c b/present/present_screen.c index 9c720c437..67c32a922 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 d2a51dbac..835e6a4b3 100644 --- a/pseudoramiX/pseudoramiX.c +++ b/pseudoramiX/pseudoramiX.c @@ -37,10 +37,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 59d101ba7..20f16da3f 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -28,8 +28,9 @@ #include +#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 2909ac84e..ade7808d6 100644 --- a/record/record.c +++ b/record/record.c @@ -36,10 +36,10 @@ and Jim Haggerty of Metheus. #include "dix/cursor_priv.h" #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 113f6e0c5..e47c60269 100644 --- a/render/render.c +++ b/render/render.c @@ -33,6 +33,7 @@ #include "dix/cursor_priv.h" #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "os/osdep.h" #include "misc.h" @@ -44,7 +45,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 821b4b132..cf65a9866 100644 --- a/test/xi2/protocol-common.c +++ b/test/xi2/protocol-common.c @@ -32,8 +32,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 4e409c5cc..7b058ff90 100644 --- a/test/xi2/protocol-xigetselectedevents.c +++ b/test/xi2/protocol-xigetselectedevents.c @@ -43,10 +43,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 6ab2afe60..0cea3d5fb 100644 --- a/test/xi2/protocol-xiquerydevice.c +++ b/test/xi2/protocol-xiquerydevice.c @@ -31,8 +31,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 96b854910..4558411e2 100644 --- a/test/xi2/protocol-xiqueryversion.c +++ b/test/xi2/protocol-xiqueryversion.c @@ -43,9 +43,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 a3ebf0919..483bbf89a 100644 --- a/test/xi2/protocol-xiselectevents.c +++ b/test/xi2/protocol-xiselectevents.c @@ -52,9 +52,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 55fbb40a5..43313bbab 100644 --- a/test/xi2/protocol-xisetclientpointer.c +++ b/test/xi2/protocol-xisetclientpointer.c @@ -39,9 +39,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 e1057b82c..ba6122a16 100644 --- a/test/xtest.c +++ b/test/xtest.c @@ -31,13 +31,13 @@ #include "dix/dix_priv.h" #include "dix/input_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 9aded01ce..150bbb673 100644 --- a/xfixes/xfixes.c +++ b/xfixes/xfixes.c @@ -44,9 +44,10 @@ #include +#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 85659382d..104dcf393 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -33,6 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "os/osdep.h" #include "xkb/xkbfmisc_priv.h" @@ -40,7 +41,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include #include "extnsionst.h" -#include "extinit_priv.h" #include "xace.h" #include "xkb-procs.h" #include "protocol-versions.h"