Commit 25ffbbb2 authored by Mike Gabriel's avatar Mike Gabriel

FONTCACHE: Drop all Xserver code blocks that relate to removed FONTCACHE extension.

parent 3aedac17
...@@ -85,13 +85,6 @@ extern void DPMSExtensionInit(INITARGS); ...@@ -85,13 +85,6 @@ extern void DPMSExtensionInit(INITARGS);
#include <nx-X11/extensions/dpmsstr.h> #include <nx-X11/extensions/dpmsstr.h>
#endif #endif
#ifdef FONTCACHE
extern void FontCacheExtensionInit(INITARGS);
#define _FONTCACHE_SERVER_
#include "fontcacheP.h"
#include "fontcachstr.h"
#endif
#ifdef XV #ifdef XV
extern void XvExtensionInit(INITARGS); extern void XvExtensionInit(INITARGS);
extern void XvMCExtensionInit(INITARGS); extern void XvMCExtensionInit(INITARGS);
......
...@@ -77,10 +77,6 @@ extern Bool noDPMSExtension; ...@@ -77,10 +77,6 @@ extern Bool noDPMSExtension;
extern Bool noEVIExtension; extern Bool noEVIExtension;
#endif #endif
#ifdef FONTCACHE
extern Bool noFontCacheExtension;
#endif
#ifdef GLXEXT #ifdef GLXEXT
extern Bool noGlxExtension; extern Bool noGlxExtension;
#endif #endif
......
...@@ -96,9 +96,6 @@ extern Bool noDPMSExtension; ...@@ -96,9 +96,6 @@ extern Bool noDPMSExtension;
#ifdef EVI #ifdef EVI
extern Bool noEVIExtension; extern Bool noEVIExtension;
#endif #endif
#ifdef FONTCACHE
extern Bool noFontCacheExtension;
#endif
#ifdef GLXEXT #ifdef GLXEXT
extern Bool noGlxExtension; extern Bool noGlxExtension;
#endif #endif
...@@ -304,9 +301,6 @@ extern void DPMSExtensionInit(INITARGS); ...@@ -304,9 +301,6 @@ extern void DPMSExtensionInit(INITARGS);
#ifdef DPSEXT #ifdef DPSEXT
extern void DPSExtensionInit(INITARGS); extern void DPSExtensionInit(INITARGS);
#endif #endif
#ifdef FONTCACHE
extern void FontCacheExtensionInit(INITARGS);
#endif
#ifdef RENDER #ifdef RENDER
extern void RenderExtensionInit(INITARGS); extern void RenderExtensionInit(INITARGS);
#endif #endif
...@@ -361,9 +355,6 @@ static ExtensionToggle ExtensionToggleList[] = ...@@ -361,9 +355,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef EVI #ifdef EVI
{ "Extended-Visual-Information", &noEVIExtension }, { "Extended-Visual-Information", &noEVIExtension },
#endif #endif
#ifdef FONTCACHE
{ "FontCache", &noFontCacheExtension },
#endif
#ifdef GLXEXT #ifdef GLXEXT
{ "GLX", &noGlxExtension }, { "GLX", &noGlxExtension },
#endif #endif
...@@ -541,9 +532,6 @@ InitExtensions(argc, argv) ...@@ -541,9 +532,6 @@ InitExtensions(argc, argv)
#if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS) #if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS)
if (!noDPMSExtension) DPMSExtensionInit(); if (!noDPMSExtension) DPMSExtensionInit();
#endif #endif
#ifdef FONTCACHE
if (!noFontCacheExtension) FontCacheExtensionInit();
#endif
#ifdef XF86BIGFONT #ifdef XF86BIGFONT
if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
#endif #endif
......
...@@ -171,9 +171,6 @@ Bool noDPMSExtension = FALSE; ...@@ -171,9 +171,6 @@ Bool noDPMSExtension = FALSE;
#ifdef EVI #ifdef EVI
Bool noEVIExtension = FALSE; Bool noEVIExtension = FALSE;
#endif #endif
#ifdef FONTCACHE
Bool noFontCacheExtension = FALSE;
#endif
#ifdef GLXEXT #ifdef GLXEXT
Bool noGlxExtension = FALSE; Bool noGlxExtension = FALSE;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment