diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-19 11:34:20 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-01 11:07:46 +0200 |
| commit | 25ffbbb2248a48968703094641c89308285895d8 (patch) | |
| tree | e0ba293441c875235bed5fbba4f5060f99721996 /nx-X11/programs/Xserver | |
| parent | 3aedac174068048f44f0cca0f70edb4004150cd3 (diff) | |
| download | nx-libs-25ffbbb2248a48968703094641c89308285895d8.tar.gz nx-libs-25ffbbb2248a48968703094641c89308285895d8.tar.bz2 nx-libs-25ffbbb2248a48968703094641c89308285895d8.zip | |
FONTCACHE: Drop all Xserver code blocks that relate to removed FONTCACHE extension.
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/extmod/modinit.h | 7 | ||||
| -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, 26 deletions
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h index f780c7a49..cc0638aed 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h @@ -85,13 +85,6 @@ extern void DPMSExtensionInit(INITARGS); #include <nx-X11/extensions/dpmsstr.h> #endif -#ifdef FONTCACHE -extern void FontCacheExtensionInit(INITARGS); -#define _FONTCACHE_SERVER_ -#include "fontcacheP.h" -#include "fontcachstr.h" -#endif - #ifdef XV extern void XvExtensionInit(INITARGS); extern void XvMCExtensionInit(INITARGS); diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index d0ffface8..905d2b522 100644 --- a/nx-X11/programs/Xserver/include/globals.h +++ b/nx-X11/programs/Xserver/include/globals.h @@ -77,10 +77,6 @@ extern Bool noDPMSExtension; extern Bool noEVIExtension; #endif -#ifdef FONTCACHE -extern Bool noFontCacheExtension; -#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 08724feab..bcf9d3c51 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -96,9 +96,6 @@ extern Bool noDPMSExtension; #ifdef EVI extern Bool noEVIExtension; #endif -#ifdef FONTCACHE -extern Bool noFontCacheExtension; -#endif #ifdef GLXEXT extern Bool noGlxExtension; #endif @@ -304,9 +301,6 @@ extern void DPMSExtensionInit(INITARGS); #ifdef DPSEXT extern void DPSExtensionInit(INITARGS); #endif -#ifdef FONTCACHE -extern void FontCacheExtensionInit(INITARGS); -#endif #ifdef RENDER extern void RenderExtensionInit(INITARGS); #endif @@ -361,9 +355,6 @@ static ExtensionToggle ExtensionToggleList[] = #ifdef EVI { "Extended-Visual-Information", &noEVIExtension }, #endif -#ifdef FONTCACHE - { "FontCache", &noFontCacheExtension }, -#endif #ifdef GLXEXT { "GLX", &noGlxExtension }, #endif @@ -541,9 +532,6 @@ InitExtensions(argc, argv) #if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS) if (!noDPMSExtension) DPMSExtensionInit(); #endif -#ifdef FONTCACHE - if (!noFontCacheExtension) FontCacheExtensionInit(); -#endif #ifdef XF86BIGFONT if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); #endif diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index ee29f8b72..a4940cf24 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -171,9 +171,6 @@ Bool noDPMSExtension = FALSE; #ifdef EVI Bool noEVIExtension = FALSE; #endif -#ifdef FONTCACHE -Bool noFontCacheExtension = FALSE; -#endif #ifdef GLXEXT Bool noGlxExtension = FALSE; #endif |