aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-04-19 11:07:49 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-01 11:07:46 +0200
commita25c0de093f6fccb9ca802cacb7ac0f0f106f9f2 (patch)
tree992bd28ac61bb46349d2e5f16ace6b268a7be94a
parent683415dfe516f14a6825a1f6f14af03f44192727 (diff)
downloadnx-libs-a25c0de093f6fccb9ca802cacb7ac0f0f106f9f2.tar.gz
nx-libs-a25c0de093f6fccb9ca802cacb7ac0f0f106f9f2.tar.bz2
nx-libs-a25c0de093f6fccb9ca802cacb7ac0f0f106f9f2.zip
TOGCUP: Drop all Xserver code blocks that relate to removed TOGCUP extension.
-rw-r--r--nx-X11/programs/Xserver/include/globals.h4
-rw-r--r--nx-X11/programs/Xserver/mi/miinitext.c12
-rw-r--r--nx-X11/programs/Xserver/os/utils.c3
3 files changed, 0 insertions, 19 deletions
diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h
index 944d196bf..91023aeb0 100644
--- a/nx-X11/programs/Xserver/include/globals.h
+++ b/nx-X11/programs/Xserver/include/globals.h
@@ -125,10 +125,6 @@ extern Bool noSecurityExtension;
extern Bool noSyncExtension;
#endif
-#ifdef TOGCUP
-extern Bool noXcupExtension;
-#endif
-
#ifdef RES
extern Bool noResExtension;
#endif
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index 9b023253d..407ecfbe4 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -132,9 +132,6 @@ extern Bool noSecurityExtension;
#ifdef XSYNC
extern Bool noSyncExtension;
#endif
-#ifdef TOGCUP
-extern Bool noXcupExtension;
-#endif
#ifdef RES
extern Bool noResExtension;
#endif
@@ -304,9 +301,6 @@ extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *);
#ifdef XF86DRI
extern void XFree86DRIExtensionInit(INITARGS);
#endif
-#ifdef TOGCUP
-extern void XcupExtensionInit(INITARGS);
-#endif
#ifdef DPMSExtension
extern void DPMSExtensionInit(INITARGS);
#endif
@@ -409,9 +403,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef XSYNC
{ "SYNC", &noSyncExtension },
#endif
-#ifdef TOGCUP
- { "TOG-CUP", &noXcupExtension },
-#endif
#ifdef RES
{ "X-Resource", &noResExtension },
#endif
@@ -556,9 +547,6 @@ InitExtensions(argc, argv)
#ifdef XCSECURITY
if (!noSecurityExtension) SecurityExtensionInit();
#endif
-#ifdef TOGCUP
- if (!noXcupExtension) XcupExtensionInit();
-#endif
#if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS)
if (!noDPMSExtension) DPMSExtensionInit();
#endif
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index 49e1c08e1..29baae389 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -207,9 +207,6 @@ Bool noSecurityExtension = FALSE;
#ifdef XSYNC
Bool noSyncExtension = FALSE;
#endif
-#ifdef TOGCUP
-Bool noXcupExtension = FALSE;
-#endif
#ifdef RES
Bool noResExtension = FALSE;
#endif