(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 <info@metux.net>

Xext/bigreq.c

@@ -35,13 +35,13 @@ from The Open Group.
 #include <X11/extensions/bigreqsproto.h>
 
 #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)

Xext/dpms.c

@@ -32,14 +32,16 @@ Equipment Corporation.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/dpmsproto.h>
+
+#include "miext/extinit_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "opaque.h"
-#include <X11/extensions/dpmsproto.h>
 #include "dpmsproc.h"
-#include "extinit_priv.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "protocol-versions.h"

Xext/geext.c

@@ -26,13 +26,16 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
-#include "windowstr.h"
+
 #include <X11/extensions/ge.h>
 
+#include "windowstr.h"
+
+#include "miext/extinit_priv.h"
+
 #include "geint.h"
 #include "geext.h"
 #include "protocol-versions.h"
-#include "extinit_priv.h"
 
 DevPrivateKeyRec GEClientPrivateKeyRec;
 

Xext/panoramiX.c

@@ -34,6 +34,7 @@ Equipment Corporation.
 #include <X11/extensions/panoramiXproto.h>
 
 #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

Xext/saver.c

@@ -36,6 +36,7 @@ in this Software without prior written authorization from the X Consortium.
 #include <X11/extensions/saverproto.h>
 
 #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;
 

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;

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 */

Xext/shm.c

@@ -45,6 +45,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xfuncproto.h>
 
 #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 */

Xext/sync.c

@@ -61,6 +61,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/syncproto.h>
 
 #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 <sys/time.h>
 #endif
 
-#include "extinit_priv.h"
-
 /*
  * Local Global Variables
  */

Xext/xcmisc.c

@@ -30,17 +30,18 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include <stdint.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/xcmiscproto.h>
+
+#include "miext/extinit_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "swaprep.h"
-#include <X11/extensions/xcmiscproto.h>
-#include "extinit_priv.h"
-
-#include <stdint.h>
 
 static int
 ProcXCMiscGetVersion(ClientPtr client)

Xext/xf86bigfont.c

@@ -60,13 +60,14 @@
 #include <X11/Xproto.h>
 #include <X11/extensions/xf86bigfproto.h>
 
+#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"

Xext/xres.c

@@ -14,6 +14,7 @@
 #include <X11/extensions/XResproto.h>
 
 #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"

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)

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;
 

Xext/xvmain.c

@@ -83,6 +83,7 @@ SOFTWARE.
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvproto.h>
 
+#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"

Xext/xvmc.c

@@ -5,8 +5,13 @@
 
 #include <string.h>
 #include <X11/X.h>
+#include <X11/Xfuncproto.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/XvMC.h>
+#include <X11/extensions/Xvproto.h>
+#include <X11/extensions/XvMCproto.h>
 
+#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 <X11/Xfuncproto.h>
-#include <X11/extensions/XvMC.h>
-#include <X11/extensions/Xvproto.h>
-#include <X11/extensions/XvMCproto.h>
 #include "xvmcext.h"
 #include "protocol-versions.h"
 

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"

composite/compext.c

@@ -45,10 +45,11 @@
 #include <dix-config.h>
 #endif
 
+#include "miext/extinit_priv.h"
+
 #include "compint.h"
 #include "xace.h"
 #include "protocol-versions.h"
-#include "extinit_priv.h"
 
 Bool noCompositeExtension = FALSE;
 

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

dbe/dbe.c

@@ -42,10 +42,10 @@
 #include <X11/Xproto.h>
 
 #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"

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"

dri3/dri3.c

@@ -19,9 +19,11 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
+
+#include "miext/extinit_priv.h"
 
 #include "dri3_priv.h"
-#include "extinit_priv.h"
 #include <drm_fourcc.h>
 
 static int dri3_request;

glx/glxdricommon.c

@@ -35,8 +35,10 @@
 #include <GL/gl.h>
 #include <GL/glxtokens.h>
 #include <GL/internal/dri_interface.h>
+
+#include "miext/extinit_priv.h"
+
 #include <os.h>
-#include "extinit_priv.h"
 #include "glxserver.h"
 #include "glxext.h"
 #include "glxcontext.h"

glx/vndext.c

@@ -35,12 +35,12 @@
 #include <dixstruct.h>
 #include <extnsionst.h>
 #include <glx_extinit.h>
-#include "extinit_priv.h"
 
 #include <GL/glxproto.h>
 #include "vndservervendor.h"
 
 #include "dix/dix_priv.h"
+#include "miext/extinit_priv.h"
 
 Bool noGlxExtension = FALSE;
 

hw/xnest/Args.c

@@ -17,7 +17,7 @@ is" without express or implied warranty.
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 
-#include "include/extinit_priv.h"
+#include "miext/extinit_priv.h"
 #include "os/ddx_priv.h"
 
 #include "screenint.h"

hw/xnest/Init.c

@@ -19,6 +19,7 @@ is" without express or implied warranty.
 #include <X11/fonts/fontstruct.h>
 
 #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"

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"

hw/xquartz/darwin.c

@@ -36,6 +36,7 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 
+#include "miext/extinit_priv.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 
@@ -53,7 +54,6 @@
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "exevents.h"
-#include "extinit_priv.h"
 #include "glx_extinit.h"
 #include "xserver-properties.h"
 

hw/xquartz/xpr/dri.c

@@ -47,10 +47,12 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+
+#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"

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.. */

hw/xwayland/xwayland-screen.c

@@ -37,7 +37,7 @@
 #include <X11/Xatom.h>
 #include <X11/Xfuncproto.h>
 
-#include "include/extinit_priv.h"
+#include "miext/extinit_priv.h"
 #include "os/osdep.h"
 #include "os/xserver_poll.h"
 

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"

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"

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"

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;

pseudoramiX/pseudoramiX.c

@@ -39,10 +39,11 @@
 
 #include <X11/Xfuncproto.h>
 
+#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 <X11/extensions/panoramiXproto.h>

randr/randr.c

@@ -30,8 +30,9 @@
 #include <dix-config.h>
 #endif
 
+#include "miext/extinit_priv.h"
+
 #include "randrstr_priv.h"
-#include "extinit_priv.h"
 
 /* From render.h */
 #ifndef SubPixelUnknown

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 <X11/extensions/recordproto.h>
 #include "set.h"
 #include "swaprep.h"

render/render.c

@@ -33,6 +33,7 @@
 #include <X11/Xfuncproto.h>
 
 #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"

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"

test/xi2/protocol-xigetselectedevents.c

@@ -45,10 +45,10 @@
 #include <X11/extensions/XI2proto.h>
 
 #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"
 

test/xi2/protocol-xiquerydevice.c

@@ -33,8 +33,10 @@
 #include <X11/Xproto.h>
 #include <X11/extensions/XI2proto.h>
 #include <X11/Xatom.h>
+
+#include "miext/extinit_priv.h"
+
 #include "inputstr.h"
-#include "extinit_priv.h"
 #include "exglobals.h"
 #include "scrnintstr.h"
 #include "xkbsrv.h"

test/xi2/protocol-xiqueryversion.c

@@ -45,9 +45,9 @@
 #include <X11/extensions/XI2proto.h>
 
 #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"

test/xi2/protocol-xiselectevents.c

@@ -54,9 +54,11 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/XI2proto.h>
+
+#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"

test/xi2/protocol-xisetclientpointer.c

@@ -41,9 +41,11 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/XI2proto.h>
+
+#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"

test/xtest.c

@@ -31,13 +31,13 @@
 #include <X11/Xatom.h>
 
 #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"

xfixes/xfixes.c

@@ -46,9 +46,10 @@
 #include <dix-config.h>
 #endif
 
+#include "miext/extinit_priv.h"
+
 #include "xfixesint.h"
 #include "protocol-versions.h"
-#include "extinit_priv.h"
 
 Bool noXFixesExtension = FALSE;
 

xkb/xkb.c

@@ -35,12 +35,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/XKMformat.h>
 
 #include "dix/dix_priv.h"
+#include "miext/extinit_priv.h"
 
 #include "misc.h"
 #include "inputstr.h"
 #include <xkbsrv.h>
 #include "extnsionst.h"
-#include "extinit_priv.h"
 #include "xace.h"
 #include "xkb-procs.h"
 #include "protocol-versions.h"