Commit 2ff2c92b authored by Mike Gabriel's avatar Mike Gabriel

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

parent 004f8f89
...@@ -48,13 +48,6 @@ extern void XCMiscExtensionInit(INITARGS); ...@@ -48,13 +48,6 @@ extern void XCMiscExtensionInit(INITARGS);
#include <nx-X11/extensions/xcmiscstr.h> #include <nx-X11/extensions/xcmiscstr.h>
#endif #endif
#ifdef XF86MISC
extern void XFree86MiscExtensionInit(INITARGS);
#define _XF86MISC_SERVER_
#define _XF86MISC_SAVER_COMPAT_
#include <nx-X11/extensions/xf86mscstr.h>
#endif
#ifdef XFreeXDGA #ifdef XFreeXDGA
extern void XFree86DGAExtensionInit(INITARGS); extern void XFree86DGAExtensionInit(INITARGS);
extern void XFree86DGARegister(INITARGS); extern void XFree86DGARegister(INITARGS);
......
...@@ -125,10 +125,6 @@ extern Bool noXFree86DGAExtension; ...@@ -125,10 +125,6 @@ extern Bool noXFree86DGAExtension;
extern Bool noXFree86DRIExtension; extern Bool noXFree86DRIExtension;
#endif #endif
#ifdef XF86MISC
extern Bool noXFree86MiscExtension;
#endif
#ifdef XFIXES #ifdef XFIXES
extern Bool noXFixesExtension; extern Bool noXFixesExtension;
#endif #endif
......
...@@ -76,12 +76,12 @@ OBJS = $(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \ ...@@ -76,12 +76,12 @@ OBJS = $(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \
* don't use the XF86 module loader. * don't use the XF86 module loader.
*/ */
EXT_DEFINES = ExtensionDefines -UXFreeXDGA -UXF86MISC \ EXT_DEFINES = ExtensionDefines -UXFreeXDGA \
-UXFree86LOADER -UXFree86LOADER
#else #else
EXT_DEFINES = ExtensionDefines -UXINPUT -UXFreeXDGA -UXF86MISC \ EXT_DEFINES = ExtensionDefines -UXINPUT -UXFreeXDGA \
-UXFree86LOADER -UXFree86LOADER
#endif #endif
......
...@@ -132,9 +132,6 @@ extern Bool noXFree86DGAExtension; ...@@ -132,9 +132,6 @@ extern Bool noXFree86DGAExtension;
#ifdef XF86DRI #ifdef XF86DRI
extern Bool noXFree86DRIExtension; extern Bool noXFree86DRIExtension;
#endif #endif
#ifdef XF86MISC
extern Bool noXFree86MiscExtension;
#endif
#ifdef XFIXES #ifdef XFIXES
extern Bool noXFixesExtension; extern Bool noXFixesExtension;
#endif #endif
...@@ -243,9 +240,6 @@ extern void SecurityExtensionInit(INITARGS); ...@@ -243,9 +240,6 @@ extern void SecurityExtensionInit(INITARGS);
#ifdef XF86BIGFONT #ifdef XF86BIGFONT
extern void XFree86BigfontExtensionInit(INITARGS); extern void XFree86BigfontExtensionInit(INITARGS);
#endif #endif
#ifdef XF86MISC
extern void XFree86MiscExtensionInit(INITARGS);
#endif
#ifdef XFreeXDGA #ifdef XFreeXDGA
extern void XFree86DGAExtensionInit(INITARGS); extern void XFree86DGAExtensionInit(INITARGS);
#endif #endif
...@@ -357,9 +351,6 @@ static ExtensionToggle ExtensionToggleList[] = ...@@ -357,9 +351,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef XF86DRI #ifdef XF86DRI
{ "XFree86-DRI", &noXFree86DRIExtension }, { "XFree86-DRI", &noXFree86DRIExtension },
#endif #endif
#ifdef XF86MISC
{ "XFree86-Misc", &noXFree86MiscExtension },
#endif
#ifdef XFIXES #ifdef XFIXES
{ "XFIXES", &noXFixesExtension }, { "XFIXES", &noXFixesExtension },
#endif #endif
...@@ -475,9 +466,6 @@ InitExtensions(argc, argv) ...@@ -475,9 +466,6 @@ InitExtensions(argc, argv)
if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
#endif #endif
#if !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS) #if !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
#if defined(XF86MISC)
if (!noXFree86MiscExtension) XFree86MiscExtensionInit();
#endif
#if defined(XFreeXDGA) #if defined(XFreeXDGA)
if (!noXFree86DGAExtension) XFree86DGAExtensionInit(); if (!noXFree86DGAExtension) XFree86DGAExtensionInit();
#endif #endif
......
...@@ -204,9 +204,6 @@ Bool noXFree86BigfontExtension = FALSE; ...@@ -204,9 +204,6 @@ Bool noXFree86BigfontExtension = FALSE;
#ifdef XF86DRI #ifdef XF86DRI
Bool noXFree86DRIExtension = FALSE; Bool noXFree86DRIExtension = FALSE;
#endif #endif
#ifdef XF86MISC
Bool noXFree86MiscExtension = FALSE;
#endif
#ifdef XFIXES #ifdef XFIXES
Bool noXFixesExtension = FALSE; Bool noXFixesExtension = FALSE;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment