Commit 8c1d16da authored by Mike Gabriel's avatar Mike Gabriel

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

parent 2ff2c92b
...@@ -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 XFreeXDGA
extern void XFree86DGAExtensionInit(INITARGS);
extern void XFree86DGARegister(INITARGS);
#define _XF86DGA_SERVER_
#include <nx-X11/extensions/xf86dgastr.h>
#endif
#ifdef DPMSExtension #ifdef DPMSExtension
extern void DPMSExtensionInit(INITARGS); extern void DPMSExtensionInit(INITARGS);
#include <nx-X11/extensions/dpmsstr.h> #include <nx-X11/extensions/dpmsstr.h>
......
...@@ -117,10 +117,6 @@ extern Bool noXCMiscExtension; ...@@ -117,10 +117,6 @@ extern Bool noXCMiscExtension;
extern Bool noXFree86BigfontExtension; extern Bool noXFree86BigfontExtension;
#endif #endif
#ifdef XFreeXDGA
extern Bool noXFree86DGAExtension;
#endif
#ifdef XF86DRI #ifdef XF86DRI
extern Bool noXFree86DRIExtension; extern Bool noXFree86DRIExtension;
#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 \ EXT_DEFINES = ExtensionDefines \
-UXFree86LOADER -UXFree86LOADER
#else #else
EXT_DEFINES = ExtensionDefines -UXINPUT -UXFreeXDGA \ EXT_DEFINES = ExtensionDefines -UXINPUT \
-UXFree86LOADER -UXFree86LOADER
#endif #endif
......
...@@ -126,9 +126,6 @@ extern Bool noXCMiscExtension; ...@@ -126,9 +126,6 @@ extern Bool noXCMiscExtension;
#ifdef XF86BIGFONT #ifdef XF86BIGFONT
extern Bool noXFree86BigfontExtension; extern Bool noXFree86BigfontExtension;
#endif #endif
#ifdef XFreeXDGA
extern Bool noXFree86DGAExtension;
#endif
#ifdef XF86DRI #ifdef XF86DRI
extern Bool noXFree86DRIExtension; extern Bool noXFree86DRIExtension;
#endif #endif
...@@ -240,9 +237,6 @@ extern void SecurityExtensionInit(INITARGS); ...@@ -240,9 +237,6 @@ extern void SecurityExtensionInit(INITARGS);
#ifdef XF86BIGFONT #ifdef XF86BIGFONT
extern void XFree86BigfontExtensionInit(INITARGS); extern void XFree86BigfontExtensionInit(INITARGS);
#endif #endif
#ifdef XFreeXDGA
extern void XFree86DGAExtensionInit(INITARGS);
#endif
#ifdef GLXEXT #ifdef GLXEXT
#ifndef __DARWIN__ #ifndef __DARWIN__
extern void GlxExtensionInit(INITARGS); extern void GlxExtensionInit(INITARGS);
...@@ -345,9 +339,6 @@ static ExtensionToggle ExtensionToggleList[] = ...@@ -345,9 +339,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef XF86BIGFONT #ifdef XF86BIGFONT
{ "XFree86-Bigfont", &noXFree86BigfontExtension }, { "XFree86-Bigfont", &noXFree86BigfontExtension },
#endif #endif
#ifdef XFreeXDGA
{ "XFree86-DGA", &noXFree86DGAExtension },
#endif
#ifdef XF86DRI #ifdef XF86DRI
{ "XFree86-DRI", &noXFree86DRIExtension }, { "XFree86-DRI", &noXFree86DRIExtension },
#endif #endif
...@@ -466,9 +457,6 @@ InitExtensions(argc, argv) ...@@ -466,9 +457,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(XFreeXDGA)
if (!noXFree86DGAExtension) XFree86DGAExtensionInit();
#endif
#ifdef XF86DRI #ifdef XF86DRI
if (!noXFree86DRIExtension) XFree86DRIExtensionInit(); if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
#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