aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-04-19 12:04:57 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-01 11:07:46 +0200
commit8c1d16dae730ee46a2ac407a125caa2a69042474 (patch)
treed8694bf8d4f288b79eb9fca1bcdf27d1bb71f9c1 /nx-X11
parent2ff2c92bb79349c0d44af590620291fd0b1f6074 (diff)
downloadnx-libs-8c1d16dae730ee46a2ac407a125caa2a69042474.tar.gz
nx-libs-8c1d16dae730ee46a2ac407a125caa2a69042474.tar.bz2
nx-libs-8c1d16dae730ee46a2ac407a125caa2a69042474.zip
XFreeXDGA: Drop all Xserver code blocks that relate to removed XFreeXDGA extension.
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/Xext/extmod/modinit.h7
-rw-r--r--nx-X11/programs/Xserver/include/globals.h4
-rw-r--r--nx-X11/programs/Xserver/mi/Imakefile4
-rw-r--r--nx-X11/programs/Xserver/mi/miinitext.c12
4 files changed, 2 insertions, 25 deletions
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
index 69babbabe..96a349add 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 XFreeXDGA
-extern void XFree86DGAExtensionInit(INITARGS);
-extern void XFree86DGARegister(INITARGS);
-#define _XF86DGA_SERVER_
-#include <nx-X11/extensions/xf86dgastr.h>
-#endif
-
#ifdef DPMSExtension
extern void DPMSExtensionInit(INITARGS);
#include <nx-X11/extensions/dpmsstr.h>
diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h
index 34491c42f..f37fb68ba 100644
--- a/nx-X11/programs/Xserver/include/globals.h
+++ b/nx-X11/programs/Xserver/include/globals.h
@@ -117,10 +117,6 @@ extern Bool noXCMiscExtension;
extern Bool noXFree86BigfontExtension;
#endif
-#ifdef XFreeXDGA
-extern Bool noXFree86DGAExtension;
-#endif
-
#ifdef XF86DRI
extern Bool noXFree86DRIExtension;
#endif
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index 6d10621dc..0d70c46ae 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 \
+EXT_DEFINES = ExtensionDefines \
-UXFree86LOADER
#else
-EXT_DEFINES = ExtensionDefines -UXINPUT -UXFreeXDGA \
+EXT_DEFINES = ExtensionDefines -UXINPUT \
-UXFree86LOADER
#endif
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index 9b851fb2e..493b3901d 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -126,9 +126,6 @@ extern Bool noXCMiscExtension;
#ifdef XF86BIGFONT
extern Bool noXFree86BigfontExtension;
#endif
-#ifdef XFreeXDGA
-extern Bool noXFree86DGAExtension;
-#endif
#ifdef XF86DRI
extern Bool noXFree86DRIExtension;
#endif
@@ -240,9 +237,6 @@ extern void SecurityExtensionInit(INITARGS);
#ifdef XF86BIGFONT
extern void XFree86BigfontExtensionInit(INITARGS);
#endif
-#ifdef XFreeXDGA
-extern void XFree86DGAExtensionInit(INITARGS);
-#endif
#ifdef GLXEXT
#ifndef __DARWIN__
extern void GlxExtensionInit(INITARGS);
@@ -345,9 +339,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef XF86BIGFONT
{ "XFree86-Bigfont", &noXFree86BigfontExtension },
#endif
-#ifdef XFreeXDGA
- { "XFree86-DGA", &noXFree86DGAExtension },
-#endif
#ifdef XF86DRI
{ "XFree86-DRI", &noXFree86DRIExtension },
#endif
@@ -466,9 +457,6 @@ InitExtensions(argc, argv)
if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
#endif
#if !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
-#if defined(XFreeXDGA)
- if (!noXFree86DGAExtension) XFree86DGAExtensionInit();
-#endif
#ifdef XF86DRI
if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
#endif