XF86VIDMODE: Drop all Xserver code blocks that relate to removed XF86VIDMODE extension.

nx-X11/programs/Xserver/Xext/extmod/modinit.h

@@ -54,12 +54,6 @@ extern void XCMiscExtensionInit(INITARGS);
 #include <nx-X11/extensions/xcmiscstr.h>
 #endif
 
-#ifdef XF86VIDMODE
-extern void	XFree86VidModeExtensionInit(INITARGS);
-#define _XF86VIDMODE_SERVER_
-#include <nx-X11/extensions/xf86vmstr.h>
-#endif
-
 #ifdef XF86MISC
 extern void XFree86MiscExtensionInit(INITARGS);
 #define _XF86MISC_SERVER_

nx-X11/programs/Xserver/include/globals.h

@@ -133,10 +133,6 @@ extern Bool noXFree86DRIExtension;
 extern Bool noXFree86MiscExtension;
 #endif
 
-#ifdef XF86VIDMODE
-extern Bool noXFree86VidModeExtension;
-#endif
-
 #ifdef XFIXES
 extern Bool noXFixesExtension;
 #endif

nx-X11/programs/Xserver/mi/Imakefile

@@ -76,12 +76,12 @@ OBJS =	$(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \
  * don't use the XF86 module loader.
  */
 
-EXT_DEFINES = ExtensionDefines -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
+EXT_DEFINES = ExtensionDefines -UXFreeXDGA -UXF86MISC \
 	-UXFree86LOADER
 
 #else
 
-EXT_DEFINES = ExtensionDefines -UXINPUT -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
+EXT_DEFINES = ExtensionDefines -UXINPUT -UXFreeXDGA -UXF86MISC \
 	-UXFree86LOADER
 
 #endif

nx-X11/programs/Xserver/mi/miinitext.c

@@ -138,9 +138,6 @@ extern Bool noXFree86DRIExtension;
 #ifdef XF86MISC
 extern Bool noXFree86MiscExtension;
 #endif
-#ifdef XF86VIDMODE
-extern Bool noXFree86VidModeExtension;
-#endif
 #ifdef XFIXES
 extern Bool noXFixesExtension;
 #endif
@@ -252,9 +249,6 @@ extern void SecurityExtensionInit(INITARGS);
 #ifdef XF86BIGFONT
 extern void XFree86BigfontExtensionInit(INITARGS);
 #endif
-#ifdef XF86VIDMODE
-extern void XFree86VidModeExtensionInit(INITARGS);
-#endif
 #ifdef XF86MISC
 extern void XFree86MiscExtensionInit(INITARGS);
 #endif
@@ -375,9 +369,6 @@ static ExtensionToggle ExtensionToggleList[] =
 #ifdef XF86MISC
     { "XFree86-Misc", &noXFree86MiscExtension },
 #endif
-#ifdef XF86VIDMODE
-    { "XFree86-VidModeExtension", &noXFree86VidModeExtension },
-#endif
 #ifdef XFIXES
     { "XFIXES", &noXFixesExtension },
 #endif
@@ -496,9 +487,6 @@ InitExtensions(argc, argv)
     if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
 #endif
 #if !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
-#if defined(XF86VIDMODE)
-    if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();
-#endif
 #if defined(XF86MISC)
     if (!noXFree86MiscExtension) XFree86MiscExtensionInit();
 #endif

nx-X11/programs/Xserver/os/utils.c

@@ -210,9 +210,6 @@ Bool noXFree86DRIExtension = FALSE;
 #ifdef XF86MISC
 Bool noXFree86MiscExtension = FALSE;
 #endif
-#ifdef XF86VIDMODE
-Bool noXFree86VidModeExtension = FALSE;
-#endif
 #ifdef XFIXES
 Bool noXFixesExtension = FALSE;
 #endif