diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-05 20:58:58 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-05 20:58:58 +0200 |
| commit | bb23f7a3d8e1ebdcf59d12d2e51bcaca849818b4 (patch) | |
| tree | 50f18d3c2e4f192322c106bb73fa07869d949091 /nx-X11/programs/Xserver/mi | |
| parent | 8ed8a43d2cad421561d0082949d2bfa9f29c7675 (diff) | |
| parent | d280fa15e571f568125786c216f168bcbfc1d15a (diff) | |
| download | nx-libs-bb23f7a3d8e1ebdcf59d12d2e51bcaca849818b4.tar.gz nx-libs-bb23f7a3d8e1ebdcf59d12d2e51bcaca849818b4.tar.bz2 nx-libs-bb23f7a3d8e1ebdcf59d12d2e51bcaca849818b4.zip | |
Merge branch 'feature/other-Xserver-cleanup' into arctica-3.6.x
Attributes GH PR #8: https://github.com/ArcticaProject/nx-libs/pull/8
Diffstat (limited to 'nx-X11/programs/Xserver/mi')
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miinitext.c | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index f3be9da5d..b70a6a67e 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -73,34 +73,6 @@ SOFTWARE. #undef GLXEXT #endif -/* Make sure Xprt only announces extensions it supports */ -#ifdef PRINT_ONLY_SERVER -#undef MITSHM /* this is incompatible to the vector-based Xprint DDX */ -#undef XKB -#undef PANORAMIX -#undef RES -#undef XINPUT -#undef XV -#undef SCREENSAVER -#undef XIDLE -#undef XRECORD -#undef XF86VIDMODE -#undef XF86MISC -#undef XFreeXDGA -#undef XF86DRI -#undef DPMSExtension -#undef DPSEXT -#undef FONTCACHE -#undef DAMAGE -#undef XFIXES -#undef XEVIE -#else -#ifndef LOADABLEPRINTDDX -#undef XPRINT -#endif /* LOADABLEPRINTDDX */ -#endif /* PRINT_ONLY_SERVER */ - - extern Bool noTestExtensions; #ifdef BIGREQS @@ -232,9 +204,6 @@ typedef void (*InitExtension)(INITARGS); #define _XLBX_SERVER_ #include <X11/extensions/lbxstr.h> #endif -#ifdef XPRINT -#include "Print.h" -#endif #ifdef XAPPGROUP #define _XAG_SERVER_ #include <X11/extensions/Xagstr.h> @@ -321,9 +290,6 @@ extern void XagExtensionInit(INITARGS); #ifdef XCSECURITY extern void SecurityExtensionInit(INITARGS); #endif -#ifdef XPRINT -extern void XpExtensionInit(INITARGS); -#endif #ifdef XF86BIGFONT extern void XFree86BigfontExtensionInit(INITARGS); #endif @@ -606,9 +572,6 @@ InitExtensions(argc, argv) #ifdef XCSECURITY if (!noSecurityExtension) SecurityExtensionInit(); #endif -#ifdef XPRINT - XpExtensionInit(); /* server-specific extension, cannot be disabled */ -#endif #ifdef TOGCUP if (!noXcupExtension) XcupExtensionInit(); #endif @@ -642,11 +605,6 @@ InitExtensions(argc, argv) if (!noGlxExtension) DarwinGlxExtensionInit(); #endif #endif -#ifdef DPSEXT -#ifndef XPRINT - if (!noDPSExtension) DPSExtensionInit(); -#endif -#endif #ifdef XFIXES /* must be before Render to layer DisplayCursor correctly */ if (!noXFixesExtension) XFixesExtensionInit(); @@ -717,9 +675,6 @@ static ExtensionModule staticExtensions[] = { #ifdef XCSECURITY { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL }, #endif -#ifdef XPRINT - { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL }, -#endif #ifdef PANORAMIX { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL }, #endif |