aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-04-19 11:36:27 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-01 11:07:46 +0200
commite80842cc42980c57a08d7ae4baadd93eddf342fe (patch)
tree65b184421a9725ca3ac387962ff9eda590d40e83
parent25ffbbb2248a48968703094641c89308285895d8 (diff)
downloadnx-libs-e80842cc42980c57a08d7ae4baadd93eddf342fe.tar.gz
nx-libs-e80842cc42980c57a08d7ae4baadd93eddf342fe.tar.bz2
nx-libs-e80842cc42980c57a08d7ae4baadd93eddf342fe.zip
EVI: Drop all Xserver code blocks that relate to removed EVI 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 905d2b522..d57615de4 100644
--- a/nx-X11/programs/Xserver/include/globals.h
+++ b/nx-X11/programs/Xserver/include/globals.h
@@ -73,10 +73,6 @@ extern Bool noDPSExtension;
extern Bool noDPMSExtension;
#endif
-#ifdef EVI
-extern Bool noEVIExtension;
-#endif
-
#ifdef GLXEXT
extern Bool noGlxExtension;
#endif
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index bcf9d3c51..ee33ff29a 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -93,9 +93,6 @@ extern Bool noDPSExtension;
#ifdef DPMSExtension
extern Bool noDPMSExtension;
#endif
-#ifdef EVI
-extern Bool noEVIExtension;
-#endif
#ifdef GLXEXT
extern Bool noGlxExtension;
#endif
@@ -213,9 +210,6 @@ extern void XTestExtension1Init(INITARGS);
#ifdef SHAPE
extern void ShapeExtensionInit(INITARGS);
#endif
-#ifdef EVI
-extern void EVIExtensionInit(INITARGS);
-#endif
#ifdef MITSHM
extern void ShmExtensionInit(INITARGS);
#endif
@@ -352,9 +346,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef DPMSExtension
{ "DPMS", &noDPMSExtension },
#endif
-#ifdef EVI
- { "Extended-Visual-Information", &noEVIExtension },
-#endif
#ifdef GLXEXT
{ "GLX", &noGlxExtension },
#endif
@@ -475,9 +466,6 @@ InitExtensions(argc, argv)
#ifdef MITSHM
if (!noMITShmExtension) ShmExtensionInit();
#endif
-#ifdef EVI
- if (!noEVIExtension) EVIExtensionInit();
-#endif
#ifdef MULTIBUFFER
if (!noMultibufferExtension) MultibufferExtensionInit();
#endif
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index a4940cf24..84cd3b575 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -168,9 +168,6 @@ Bool noDPSExtension = FALSE;
#ifdef DPMSExtension
Bool noDPMSExtension = FALSE;
#endif
-#ifdef EVI
-Bool noEVIExtension = FALSE;
-#endif
#ifdef GLXEXT
Bool noGlxExtension = FALSE;
#endif