From 2ff2c92bb79349c0d44af590620291fd0b1f6074 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 19 Apr 2016 12:02:12 +0200
Subject: XF86MISC: Drop all Xserver code blocks that relate to removed
 XF86MISC extension.

---
 nx-X11/programs/Xserver/Xext/extmod/modinit.h |  7 -------
 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(+), 28 deletions(-)

diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
index 3edb9f70f..69babbabe 100644
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h
+++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
@@ -48,13 +48,6 @@ extern void XCMiscExtensionInit(INITARGS);
 #include <nx-X11/extensions/xcmiscstr.h>
 #endif
 
-#ifdef XF86MISC
-extern void XFree86MiscExtensionInit(INITARGS);
-#define _XF86MISC_SERVER_
-#define _XF86MISC_SAVER_COMPAT_
-#include <nx-X11/extensions/xf86mscstr.h>
-#endif
-
 #ifdef XFreeXDGA
 extern void XFree86DGAExtensionInit(INITARGS);
 extern void XFree86DGARegister(INITARGS);
diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h
index 523e0812d..34491c42f 100644
--- a/nx-X11/programs/Xserver/include/globals.h
+++ b/nx-X11/programs/Xserver/include/globals.h
@@ -125,10 +125,6 @@ extern Bool noXFree86DGAExtension;
 extern Bool noXFree86DRIExtension;
 #endif
 
-#ifdef XF86MISC
-extern Bool noXFree86MiscExtension;
-#endif
-
 #ifdef XFIXES
 extern Bool noXFixesExtension;
 #endif
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index 185e57a28..6d10621dc 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 -UXFreeXDGA -UXF86MISC \
+EXT_DEFINES = ExtensionDefines -UXFreeXDGA \
 	-UXFree86LOADER
 
 #else
 
-EXT_DEFINES = ExtensionDefines -UXINPUT -UXFreeXDGA -UXF86MISC \
+EXT_DEFINES = ExtensionDefines -UXINPUT -UXFreeXDGA \
 	-UXFree86LOADER
 
 #endif
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index 706ebde9a..9b851fb2e 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -132,9 +132,6 @@ extern Bool noXFree86DGAExtension;
 #ifdef XF86DRI
 extern Bool noXFree86DRIExtension;
 #endif
-#ifdef XF86MISC
-extern Bool noXFree86MiscExtension;
-#endif
 #ifdef XFIXES
 extern Bool noXFixesExtension;
 #endif
@@ -243,9 +240,6 @@ extern void SecurityExtensionInit(INITARGS);
 #ifdef XF86BIGFONT
 extern void XFree86BigfontExtensionInit(INITARGS);
 #endif
-#ifdef XF86MISC
-extern void XFree86MiscExtensionInit(INITARGS);
-#endif
 #ifdef XFreeXDGA
 extern void XFree86DGAExtensionInit(INITARGS);
 #endif
@@ -357,9 +351,6 @@ static ExtensionToggle ExtensionToggleList[] =
 #ifdef XF86DRI
     { "XFree86-DRI", &noXFree86DRIExtension },
 #endif
-#ifdef XF86MISC
-    { "XFree86-Misc", &noXFree86MiscExtension },
-#endif
 #ifdef XFIXES
     { "XFIXES", &noXFixesExtension },
 #endif
@@ -475,9 +466,6 @@ InitExtensions(argc, argv)
     if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
 #endif
 #if !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
-#if defined(XF86MISC)
-    if (!noXFree86MiscExtension) XFree86MiscExtensionInit();
-#endif
 #if defined(XFreeXDGA)
     if (!noXFree86DGAExtension) XFree86DGAExtensionInit();
 #endif
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index 20b55668c..3f58b6fc5 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -204,9 +204,6 @@ Bool noXFree86BigfontExtension = FALSE;
 #ifdef XF86DRI
 Bool noXFree86DRIExtension = FALSE;
 #endif
-#ifdef XF86MISC
-Bool noXFree86MiscExtension = FALSE;
-#endif
 #ifdef XFIXES
 Bool noXFixesExtension = FALSE;
 #endif
-- 
cgit v1.2.3