aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/Xext/extmod/modinit.h7
-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
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