From e142314433d9de8a3fcf1c4ee801f350b32b57e2 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 19 Apr 2016 11:56:20 +0200
Subject: XF86VIDMODE: Drop all Xserver code blocks that relate to removed
 XF86VIDMODE extension.

---
 nx-X11/programs/Xserver/Xext/extmod/modinit.h |  6 ------
 nx-X11/programs/Xserver/include/globals.h     |  4 ----
 nx-X11/programs/Xserver/mi/Imakefile          |  4 ++--
 nx-X11/programs/Xserver/mi/miinitext.c        | 12 ------------
 nx-X11/programs/Xserver/os/utils.c            |  3 ---
 5 files changed, 2 insertions(+), 27 deletions(-)

(limited to 'nx-X11')

diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
index 10ec05a92..1e1d4d3e6 100644
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h
+++ b/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_
diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h
index 40a8d9f2d..d3e8e8a38 100644
--- a/nx-X11/programs/Xserver/include/globals.h
+++ b/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
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index 4f87dec8e..185e57a28 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/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
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index c9865413d..a195b6a26 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/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
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index 25eff944f..7b9d9edda 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/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
-- 
cgit v1.2.3