diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-19 11:58:37 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-01 11:07:46 +0200 |
| commit | 004f8f89682baf4767e86c271aa440251582b818 (patch) | |
| tree | a313bad3c8f08ac8aa86ee893371912063e41db6 | |
| parent | e142314433d9de8a3fcf1c4ee801f350b32b57e2 (diff) | |
| download | nx-libs-004f8f89682baf4767e86c271aa440251582b818.tar.gz nx-libs-004f8f89682baf4767e86c271aa440251582b818.tar.bz2 nx-libs-004f8f89682baf4767e86c271aa440251582b818.zip | |
MITMISC: Drop all Xserver code blocks that relate to removed MITMISC extension.
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/extmod/modinit.h | 6 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/include/globals.h | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miinitext.c | 12 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 3 |
4 files changed, 0 insertions, 25 deletions
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h index 1e1d4d3e6..3edb9f70f 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h @@ -15,12 +15,6 @@ extern void ShapeExtensionInit(INITARGS); #include <nx-X11/extensions/shapestr.h> #endif -#ifdef MITMISC -extern void MITMiscExtensionInit(INITARGS); -#define _MITMISC_SERVER_ -#include <nx-X11/extensions/mitmiscstr.h> -#endif - #ifdef XTEST extern void XTestExtensionInit(INITARGS); #define _XTEST_SERVER_ diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index d3e8e8a38..523e0812d 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -85,10 +85,6 @@ extern Bool noScreenSaverExtension; extern Bool noMITShmExtension; #endif -#ifdef MITMISC -extern Bool noMITMiscExtension; -#endif - #ifdef RANDR extern Bool noRRExtension; #endif diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index a195b6a26..706ebde9a 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -102,9 +102,6 @@ extern Bool noScreenSaverExtension; #ifdef MITSHM extern Bool noMITShmExtension; #endif -#ifdef MITMISC -extern Bool noMITMiscExtension; -#endif #ifdef RANDR extern Bool noRRExtension; #endif @@ -212,9 +209,6 @@ extern void XTestExtensionInit(INITARGS); #ifdef BIGREQS extern void BigReqExtensionInit(INITARGS); #endif -#ifdef MITMISC -extern void MITMiscExtensionInit(INITARGS); -#endif #ifdef XIDLE extern void XIdleExtensionInit(INITARGS); #endif @@ -333,9 +327,6 @@ static ExtensionToggle ExtensionToggleList[] = #ifdef MITSHM { SHMNAME, &noMITShmExtension }, #endif -#ifdef MITMISC - { "MIT-SUNDRY-NONSTANDARD", &noMITMiscExtension }, -#endif #ifdef RANDR { "RANDR", &noRRExtension }, #endif @@ -444,9 +435,6 @@ InitExtensions(argc, argv) #ifdef BIGREQS if (!noBigReqExtension) BigReqExtensionInit(); #endif -#ifdef MITMISC - if (!noMITMiscExtension) MITMiscExtensionInit(); -#endif #ifdef XIDLE if (!noXIdleExtension) XIdleExtensionInit(); #endif diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 7b9d9edda..20b55668c 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -177,9 +177,6 @@ Bool noScreenSaverExtension = FALSE; #ifdef MITSHM Bool noMITShmExtension = FALSE; #endif -#ifdef MITMISC -Bool noMITMiscExtension = FALSE; -#endif #ifdef RANDR Bool noRRExtension = FALSE; #endif |