From 3c028a8cc0cc0b82837bc0356e03ae11a1dbb2da Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 28 Jun 2024 20:17:48 +0200 Subject: [PATCH] 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 | 2 +- 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 | 2 +- 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 | 2 +- damageext/damageext.c | 2 +- dbe/dbe.c | 2 +- dix/dispatch.c | 1 + dri3/dri3.c | 2 +- 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 | 2 +- xkb/xkb.c | 2 +- 49 files changed, 66 insertions(+), 57 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 678ba6944..f4bf241fe 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 "Xext/geext_priv.h" @@ -39,9 +41,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 2ddff31ba..5c511ecf8 100644 --- a/Xext/geext.c +++ b/Xext/geext.c @@ -28,11 +28,11 @@ #include #include +#include "miext/extinit_priv.h" #include "Xext/geext_priv.h" #include "windowstr.h" #include "protocol-versions.h" -#include "extinit_priv.h" #define MAXEXTENSIONS 128 diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 2c8f31740..cdcff3ecc 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -34,6 +34,7 @@ Equipment Corporation. #include "dix/dix_priv.h" #include "dix/resource_priv.h" #include "dix/screen_hooks_priv.h" +#include "miext/extinit_priv.h" #include "Xext/panoramiX.h" #include "Xext/panoramiXsrv.h" @@ -55,7 +56,6 @@ Equipment Corporation. #include "xfixesint.h" #include "damageextint.h" #include "compint.h" -#include "extinit_priv.h" #include "protocol-versions.h" #ifdef GLXPROXY diff --git a/Xext/saver.c b/Xext/saver.c index 41af98b8d..e5204b932 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -37,6 +37,7 @@ in this Software without prior written authorization from the X Consortium. #include "dix/cursor_priv.h" #include "dix/dix_priv.h" #include "dix/window_priv.h" +#include "miext/extinit_priv.h" #include "os/osdep.h" #include "os/screensaver.h" #include "Xext/panoramiX.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 08c75ca29..b03cbb193 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group. #include "dix/dix_priv.h" #include "dix/registry_priv.h" #include "dix/resource_priv.h" -#include "include/extinit_priv.h" +#include "miext/extinit_priv.h" #include "os/audit.h" #include "os/auth.h" #include "os/client_priv.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 584ce510b..6995c1b18 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 "Xext/panoramiX.h" #include "Xext/panoramiXsrv.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" Bool noShapeExtension = FALSE; diff --git a/Xext/shm.c b/Xext/shm.c index e946076e0..b879c6f74 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -44,6 +44,7 @@ in this Software without prior written authorization from The Open Group. #include "dix/dix_priv.h" #include "dix/screen_hooks_priv.h" +#include "miext/extinit_priv.h" #include "os/auth.h" #include "os/busfault.h" #include "os/client_priv.h" @@ -63,7 +64,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 aa3da6efb..0e426a05e 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/bug_priv.h" #include "os/osdep.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 e42ce1e54..81ac44f16 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -34,13 +34,13 @@ from The Open Group. #include #include "dix/resource_priv.h" +#include "miext/extinit_priv.h" #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "swaprep.h" -#include "extinit_priv.h" static int ProcXCMiscGetVersion(ClientPtr client) diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index 1c55bec4b..b4ff976ae 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 bfa6b2ef1..8f1b0de39 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -14,6 +14,7 @@ #include "dix/registry_priv.h" #include "dix/resource_priv.h" #include "os/client_priv.h" +#include "miext/extinit_priv.h" #include "Xext/xace.h" #include "misc.h" @@ -24,7 +25,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 e5c782d24..e6507a611 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 5e0da4b21..90a3b278c 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/client_priv.h" #include "os/osdep.h" #include "Xext/panoramiX.h" @@ -60,7 +61,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 c200f82ff..e7e23c3d8 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -82,6 +82,7 @@ SOFTWARE. #include #include "dix/screen_hooks_priv.h" +#include "miext/extinit_priv.h" #include "Xext/panoramiX.h" #include "Xext/panoramiXsrv.h" #include "Xext/xvdix_priv.h" @@ -93,7 +94,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 aa9fde0f0..989b604c0 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -3,9 +3,14 @@ #include #include +#include #include +#include +#include +#include #include "dix/screen_hooks_priv.h" +#include "miext/extinit_priv.h" #include "Xext/xvdix_priv.h" #include "misc.h" @@ -14,12 +19,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 df678ecfa..7438d5a6c 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -63,12 +63,12 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/exevents_priv.h" #include "dix/extension_priv.h" +#include "miext/extinit_priv.h" #include "Xext/geext_priv.h" #include "inputstr.h" #include "gcstruct.h" /* pointer for extnsionst.h */ #include "extnsionst.h" /* extension entry */ -#include "extinit_priv.h" #include "exglobals.h" #include "swaprep.h" #include "privates.h" diff --git a/composite/compext.c b/composite/compext.c index b52e514fd..6647f865e 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -44,12 +44,12 @@ #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "Xext/panoramiXsrv.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 4e4a1d126..8a41185e0 100644 --- a/damageext/damageext.c +++ b/damageext/damageext.c @@ -24,6 +24,7 @@ #include #include "dix/dix_priv.h" +#include "miext/extinit_priv.h" #include "os/client_priv.h" #include "Xext/panoramiX.h" #include "Xext/panoramiXsrv.h" @@ -31,7 +32,6 @@ #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 67e15ef1a..b9a8b7da1 100644 --- a/dbe/dbe.c +++ b/dbe/dbe.c @@ -41,10 +41,10 @@ #include "dix/dix_priv.h" #include "dix/screen_hooks_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 bb8854b59..63ab65553 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -113,6 +113,7 @@ Equipment Corporation. #include "dix/screenint_priv.h" #include "dix/window_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 9d89b3adc..f640ef4e8 100644 --- a/dri3/dri3.c +++ b/dri3/dri3.c @@ -22,9 +22,9 @@ #include #include "dix/screen_hooks_priv.h" +#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 906f9defc..d0730798a 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 513e317bd..bfaa33717 100644 --- a/glx/vndext.c +++ b/glx/vndext.c @@ -36,12 +36,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 a84976778..32add64ed 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 def2bcaa3..52a5308b8 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 "cursorstr.h" #include "scrnintstr.h" #include "windowstr.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 aae836550..fcc68e397 100644 --- a/hw/xwayland/xwayland-screen.c +++ b/hw/xwayland/xwayland-screen.c @@ -41,7 +41,7 @@ #include "dix/input_priv.h" #include "dix/property_priv.h" #include "dix/screen_hooks_priv.h" -#include "include/extinit_priv.h" +#include "miext/extinit_priv.h" #include "os/client_priv.h" #include "os/osdep.h" #include "os/xserver_poll.h" diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index d8046d6d1..1521ed2f6 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" #include "xkb/xkbsrv_priv.h" @@ -63,11 +64,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 4467c6212..cd8d836df 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -87,9 +87,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 8fc3dd47c..528ea90ab 100644 --- a/os/utils.c +++ b/os/utils.c @@ -106,6 +106,7 @@ __stdcall unsigned long GetTickCount(void); #include "dix/dix_priv.h" #include "dix/input_priv.h" +#include "miext/extinit_priv.h" #include "os/auth.h" #include "os/bug_priv.h" #include "os/cmdline.h" @@ -120,7 +121,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 81cf4254d..ce9a2103a 100644 --- a/present/present_screen.c +++ b/present/present_screen.c @@ -25,7 +25,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 cba216c34..2b724b19a 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -28,9 +28,8 @@ #include -#include "extinit_priv.h" - #include "dix/screen_hooks_priv.h" +#include "miext/extinit_priv.h" #include "randr/randrstr_priv.h" #include "randr/rrdispatch_priv.h" diff --git a/record/record.c b/record/record.c index c0fe2f314..c2bfbfbe1 100644 --- a/record/record.c +++ b/record/record.c @@ -44,13 +44,13 @@ and Jim Haggerty of Metheus. #include "dix/eventconvert.h" #include "dix/input_priv.h" #include "dix/resource_priv.h" +#include "miext/extinit_priv.h" #include "os/client_priv.h" #include "Xext/panoramiX.h" #include "Xext/panoramiXsrv.h" #include "dixstruct.h" #include "extnsionst.h" -#include "extinit_priv.h" #include "set.h" #include "swaprep.h" #include "inputstr.h" diff --git a/render/render.c b/render/render.c index 4e6389a34..9384ae59b 100644 --- a/render/render.c +++ b/render/render.c @@ -34,6 +34,7 @@ #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 "Xext/panoramiX.h" #include "Xext/panoramiXsrv.h" @@ -46,7 +47,6 @@ #include "windowstr.h" #include "pixmapstr.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 59077f24b..397b707f5 100644 --- a/test/xi2/protocol-common.c +++ b/test/xi2/protocol-common.c @@ -33,9 +33,9 @@ #include "dix/atom_priv.h" #include "dix/dix_priv.h" #include "dix/exevents_priv.h" +#include "miext/extinit_priv.h" #include "xkb/xkbsrv_priv.h" /* for XkbInitPrivates */ -#include "extinit_priv.h" #include "exglobals.h" #include "xserver-properties.h" #include "syncsrv.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 6f7761739..f2e12c783 100644 --- a/test/xtest.c +++ b/test/xtest.c @@ -32,13 +32,13 @@ #include "dix/atom_priv.h" #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 078d48d35..1fa9848ba 100644 --- a/xfixes/xfixes.c +++ b/xfixes/xfixes.c @@ -44,11 +44,11 @@ #include +#include "miext/extinit_priv.h" #include "os/fmt.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 d23c62b1e..60984c5a2 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" #include "xkb/xkbsrv_priv.h" @@ -40,7 +41,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "misc.h" #include "inputstr.h" #include "extnsionst.h" -#include "extinit_priv.h" #include "xace.h" #include "xkb-procs.h" #include "protocol-versions.h"