xfree86: vidmode: unexport noXFree86VidModeExtension and move into extension

This isn't needed by any external module, so no need to export it.
And those flags are better off in the corresponding extension,
instead of the OS layer.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

Xext/bigreq.c

@@ -33,13 +33,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

@@ -30,7 +30,9 @@ Equipment Corporation.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/dpmsproto.h>
 
+#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 <X11/extensions/dpmsproto.h>
 #include "dpmsproc.h"
-#include "extinit_priv.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "protocol-versions.h"

Xext/geext.c

@@ -24,12 +24,14 @@
  */
 
 #include <dix-config.h>
-#include "windowstr.h"
+
 #include <X11/extensions/ge.h>
 
+#include "miext/extinit_priv.h"
+
+#include "windowstr.h"
 #include "geext.h"
 #include "protocol-versions.h"
-#include "extinit_priv.h"
 
 Bool noGEExtension = FALSE;
 

Xext/panoramiX.c

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

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

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/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.h"
 #include "protocol-versions.h"
 
 Bool noSecurityExtension = FALSE;

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;

Xext/shm.c

@@ -43,6 +43,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/client_priv.h"
@@ -60,7 +61,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

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

Xext/xcmisc.c

@@ -28,17 +28,18 @@ from The Open Group.
 
 #include <dix-config.h>
 
+#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

@@ -58,13 +58,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.h"
 #include "protocol-versions.h"
 
 #include "xf86bigfontsrv.h"

Xext/xres.c

@@ -12,6 +12,7 @@
 #include <X11/extensions/XResproto.h>
 
 #include "dix/registry_priv.h"
+#include "miext/extinit_priv.h"
 #include "os/client_priv.h"
 
 #include "misc.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"

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)

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"
 
@@ -59,7 +60,6 @@
 #include "xserver-properties.h"
 #include "eventstr.h"
 #include "inpututils.h"
-#include "extinit_priv.h"
 
 Bool noTestExtensions = FALSE;
 

Xext/xvmain.c

@@ -83,6 +83,8 @@ SOFTWARE.
 
 #include "Xext/xvdix_priv.h"
 
+#include "miext/extinit_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "scrnintstr.h"
@@ -90,7 +92,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

@@ -3,22 +3,24 @@
 
 #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 "Xext/xvdix_priv.h"
 
+#include "miext/extinit_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "resource.h"
 #include "scrnintstr.h"
 #include "extnsionst.h"
-#include "extinit_priv.h"
 #include "servermd.h"
-#include <X11/Xfuncproto.h>
+#include "xvdix.h"
-#include <X11/extensions/XvMC.h>
-#include <X11/extensions/Xvproto.h>
-#include <X11/extensions/XvMCproto.h>
 #include "xvmcext.h"
 
 #ifdef HAS_XVMCSHM

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"

Xi/xigetclientpointer.c

@@ -36,7 +36,6 @@
 #include "windowstr.h"          /* window structure  */
 #include "scrnintstr.h"         /* screen structure  */
 #include "extnsionst.h"
-#include "extinit.h"            /* LookupDeviceIntRec */
 #include "exevents.h"
 #include "exglobals.h"
 #include "xigetclientpointer.h"

composite/compext.c

@@ -43,10 +43,11 @@
 
 #include <dix-config.h>
 
+#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;

damageext/damageext.c

@@ -24,12 +24,12 @@
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
+#include "miext/extinit_priv.h"
 #include "os/client_priv.h"
 
 #include "damageextint.h"
 #include "damagestr.h"
 #include "protocol-versions.h"
-#include "extinit_priv.h"
 #include "dixstruct_priv.h"
 
 #ifdef XINERAMA

dbe/dbe.c

@@ -40,10 +40,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

@@ -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"

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

@@ -33,8 +33,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.h"
 #include "glxserver.h"
 #include "glxext.h"
 #include "glxcontext.h"

glx/glxext.c

@@ -39,7 +39,6 @@
 #include <propertyst.h>
 #include "privates.h"
 #include <os.h>
-#include "extinit.h"
 #include "glx_extinit.h"
 #include "unpack.h"
 #include "glxutil.h"

glx/glxscreens.c

@@ -36,7 +36,6 @@
 #include <os.h>
 #include <colormapst.h>
 
-#include "extinit.h"
 #include "privates.h"
 #include "glxserver.h"
 #include "glxutil.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/kdrive/src/kinput.c

@@ -46,7 +46,6 @@
 #include "xkbsrv.h"
 #include "XIstubs.h"            /* even though we don't use stubs.  cute, no? */
 #include "exevents.h"
-#include "extinit.h"
 #include "exglobals.h"
 #include "eventstr.h"
 #include "xserver-properties.h"

hw/vfb/InitInput.c

@@ -41,7 +41,6 @@ from The Open Group.
 #include "xkbsrv.h"
 #include "xserver-properties.h"
 #include "exevents.h"
-#include "extinit.h"
 
 void
 ProcessInputEvents(void)

hw/xfree86/common/xf86Extensions.c

@@ -28,7 +28,6 @@
 #endif
 
 #include "extension.h"
-#include "extinit.h"
 #include "globals.h"
 
 #include "xf86.h"

hw/xfree86/common/xf86Extensions.h

@@ -29,27 +29,27 @@
 #include "extnsionst.h"
 
 #ifdef XF86DRI
-extern _X_EXPORT Bool noXFree86DRIExtension;
+extern Bool noXFree86DRIExtension;
-extern void XFree86DRIExtensionInit(void);
+void XFree86DRIExtensionInit(void);
 #endif
 
 #ifdef DRI2
 #include <X11/extensions/dri2proto.h>
-extern _X_EXPORT Bool noDRI2Extension;
+extern Bool noDRI2Extension;
-extern void DRI2ExtensionInit(void);
+void DRI2ExtensionInit(void);
 #endif
 
 #ifdef XF86VIDMODE
 #include <X11/extensions/xf86vmproto.h>
-extern _X_EXPORT Bool noXFree86VidModeExtension;
+extern Bool noXFree86VidModeExtension;
 extern void XFree86VidModeExtensionInit(void);
 #endif
 
 #ifdef XFreeXDGA
 #include <X11/extensions/xf86dgaproto.h>
-extern _X_EXPORT Bool noXFree86DGAExtension;
+extern Bool noXFree86DGAExtension;
-extern void XFree86DGAExtensionInit(void);
+void XFree86DGAExtensionInit(void);
-extern void XFree86DGARegister(void);
+void XFree86DGARegister(void);
 #endif
 
 #endif

hw/xfree86/common/xf86VidMode.c

@@ -42,7 +42,6 @@
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
-#include "extinit.h"
 
 #ifdef XF86VIDMODE
 #include "vidmodestr.h"

hw/xfree86/common/xf86Xinput.c

@@ -68,7 +68,6 @@
 #include "XIstubs.h"
 #include "xf86Optrec.h"
 #include "mipointer.h"
-#include "extinit.h"
 #include "loaderProcs.h"
 #include "systemd-logind.h"
 #include "exevents.h"           /* AddInputDevice */

hw/xfree86/dixmods/glxmodule.c

@@ -42,7 +42,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "micmap.h"
 #include "globals.h"
 #include "glxserver.h"
-#include "extinit.h"
 #include "glx_extinit.h"
 
 static MODULESETUPPROTO(glxSetup);

hw/xfree86/dri/dri.c

@@ -54,7 +54,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include "extinit.h"
 #include "colormapst.h"
 #include "cursorstr.h"
 #include "scrnintstr.h"

hw/xfree86/dri/xf86dri.c

@@ -48,7 +48,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include "extinit.h"
 #include "colormapst.h"
 #include "cursorstr.h"
 #include "scrnintstr.h"

hw/xfree86/dri2/dri2ext.c

@@ -56,7 +56,6 @@
 
 static int DRI2EventBase;
 
-
 static Bool
 validDrawable(ClientPtr client, XID drawable, Mask access_mode,
               DrawablePtr *pDrawable, int *status)

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

@@ -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.h"
 
 #include "Display.h"

hw/xquartz/X11Application.m

@@ -35,6 +35,8 @@
 #import "X11Application.h"
 #import "NSUserDefaults+XQuartzDefaults.h"
 
+#include "miext/extinit_priv.h"
+
 #include "darwin.h"
 #include "quartz.h"
 #include "darwinEvents.h"
@@ -78,9 +80,6 @@ static dispatch_queue_t eventTranslationQueue;
 #define APPKIT_APPFLAGS_HACK 1
 #endif
 
-extern Bool noTestExtensions;
-extern Bool noRenderExtension;
-
 static TISInputSourceRef last_key_layout;
 
 /* This preference is only tested on Lion or later as it's not relevant to

hw/xquartz/darwin.c

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

hw/xquartz/xpr/dri.c

@@ -45,10 +45,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.h"
 #include "colormapst.h"
 #include "cursorstr.h"
 #include "scrnintstr.h"

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

hw/xwayland/xwayland-screen.c

@@ -39,11 +39,11 @@
 
 #include "dix/input_priv.h"
 #include "dix/property_priv.h"
+#include "miext/extinit_priv.h"
 #include "os/client_priv.h"
 #include "os/osdep.h"
 #include "os/xserver_poll.h"
 
-#include "extinit_priv.h"
 #include <micmap.h>
 #include <misyncshm.h>
 #include <os.h>

hw/xwayland/xwayland-vidmode.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "os.h"
-#include "extinit.h"
 
 #ifdef XF86VIDMODE
 

hw/xwayland/xwayland.c

@@ -63,7 +63,7 @@
 
 #ifdef XF86VIDMODE
 #include <X11/extensions/xf86vmproto.h>
-Bool noXFree86VidModeExtension;
+Bool noXFree86VidModeExtension = FALSE;
 #endif
 
 void

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"

include/extinit.h

@@ -53,20 +53,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "extnsionst.h"
 
+/* required by: libglx */
 #ifdef COMPOSITE
 extern _X_EXPORT Bool noCompositeExtension;
 #endif
 
+/* required by: several video drivers (eg. vmware and sis) */
 #ifdef XINERAMA
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif /* XINERAMA */
 
+/* required by: intel_drv */
 #if defined(XV)
 extern _X_EXPORT Bool noXvExtension;
 #endif
 
-#if defined(PRESENT)
-#include "presentext.h"
-#endif
-
 #endif

mi/mieq.c

@@ -54,7 +54,6 @@ in this Software without prior written authorization from The Open Group.
 #include   "inpututils.h"
 #include   "mipointer.h"
 #include   "scrnintstr.h"
-#include   "extinit.h"
 #include   "exglobals.h"
 #include   "eventstr.h"
 

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"

miext/extinit_priv.h

@@ -53,5 +53,6 @@ void XvExtensionInit(void);
 void XvMCExtensionInit(void);
 void dri3_extension_init(void);
 void PseudoramiXExtensionInit(void);
+void present_extension_init(void);
 
 #endif /* _XSERVER_EXTINIT_PRIV_H */

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 <X11/Xos_r.h>

present/meson.build

@@ -13,7 +13,6 @@ srcs_present = [
 
 hdrs_present = [
     'present.h',
-    'presentext.h',
 ]
 
 libxserver_present = static_library('libxserver_present',

present/present.h

@@ -27,7 +27,6 @@
 #include <X11/extensions/presentproto.h>
 
 #include "randrstr.h"
-#include "presentext.h"
 
 typedef enum {
     PRESENT_FLIP_REASON_UNKNOWN,

present/present_screen.c

@@ -23,6 +23,8 @@
 
 #include "present_priv.h"
 
+#include "miext/extinit_priv.h"
+
 int present_request;
 DevPrivateKeyRec present_screen_private_key;
 DevPrivateKeyRec present_window_private_key;

present/presentext.h

@@ -1,30 +0,0 @@
-/*
- * Copyright © 2013 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef _PRESENTEXT_H_
-#define _PRESENTEXT_H_
-
-#include <X11/Xfuncproto.h>
-
-_X_EXPORT void present_extension_init(void);
-
-#endif /* _PRESENTEXT_H_ */

pseudoramiX/pseudoramiX.c

@@ -37,10 +37,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

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

record/record.c

@@ -36,11 +36,11 @@ and Jim Haggerty of Metheus.
 
 #include "dix/cursor_priv.h"
 #include "dix/eventconvert.h"
+#include "miext/extinit_priv.h"
 #include "os/client_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 "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"

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"

test/xi2/protocol-xigetselectedevents.c

@@ -43,10 +43,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.h"            /* for XInputExtensionInit */
 #include "scrnintstr.h"
 #include "xiselectev.h"
 

test/xi2/protocol-xiquerydevice.c

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

test/xi2/protocol-xiqueryversion.c

@@ -43,9 +43,9 @@
 #include <X11/extensions/XI2proto.h>
 
 #include "dix/exevents_priv.h"
+#include "miext/extinit_priv.h"            /* for XInputExtensionInit */
 
 #include "inputstr.h"
-#include "extinit.h"            /* for XInputExtensionInit */
 #include "scrnintstr.h"
 #include "xiqueryversion.h"
 #include "protocol-common.h"

test/xi2/protocol-xiselectevents.c

@@ -52,9 +52,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.h"            /* for XInputExtensionInit */
 #include "scrnintstr.h"
 #include "exglobals.h"
 #include "xiselectev.h"

test/xi2/protocol-xisetclientpointer.c

@@ -39,9 +39,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.h"            /* for XInputExtensionInit */
 #include "scrnintstr.h"
 #include "xisetclientpointer.h"
 #include "exevents.h"

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"

xfixes/xfixes.c

@@ -44,11 +44,11 @@
 
 #include <dix-config.h>
 
+#include "miext/extinit_priv.h"
 #include "os/fmt.h"
 
 #include "xfixesint.h"
 #include "protocol-versions.h"
-#include "extinit_priv.h"
 
 Bool noXFixesExtension = FALSE;
 

xkb/xkb.c

@@ -33,6 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/XKMformat.h>
 
 #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 <xkbsrv.h>
 #include "extnsionst.h"
-#include "extinit_priv.h"
 #include "xace.h"
 #include "xkb-procs.h"
 #include "protocol-versions.h"