aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/programs/Xserver/dix/dixfonts.c4
-rw-r--r--nx-X11/programs/Xserver/include/dixfont.h5
2 files changed, 1 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c
index 4ac9fa696..c8e5f6cf0 100644
--- a/nx-X11/programs/Xserver/dix/dixfonts.c
+++ b/nx-X11/programs/Xserver/dix/dixfonts.c
@@ -1953,11 +1953,7 @@ InitFonts ()
{
patternCache = MakeFontPatternCache();
-#if defined(BUILTIN_FONTS) || defined(NXAGENT_SERVER)
- BuiltinRegisterFpeFunctions();
-#else
register_fpe_functions();
-#endif
}
int
diff --git a/nx-X11/programs/Xserver/include/dixfont.h b/nx-X11/programs/Xserver/include/dixfont.h
index 1303d0e0f..6149d2160 100644
--- a/nx-X11/programs/Xserver/include/dixfont.h
+++ b/nx-X11/programs/Xserver/include/dixfont.h
@@ -150,9 +150,6 @@ extern void InitGlyphCaching(void);
extern void SetGlyphCachingMode(int /*newmode*/);
-/*
- * libXfont/src/builtins/builtin.h
- */
-extern _X_EXPORT void BuiltinRegisterFpeFunctions(void);
+extern void register_fpe_functions(void);
#endif /* DIXFONT_H */