From cb760f14d69c33b8617787ebcca6c4477ed33598 Mon Sep 17 00:00:00 2001 From: Tiago Vignatti Date: Thu, 9 Feb 2017 08:55:07 +0100 Subject: dix: use one single function to register fpe fonts In NXAGENT_SERVER we can also fully rely on libXfont for handling fpe internals. Backported from X.org: commit 75536ee80595c79bba95a1fb6844126ee08486d4 Author: Tiago Vignatti Date: Wed Jun 23 15:18:03 2010 +0300 dix: use one single function to register fpe fonts X server doesn't need to understand fpe internals, so use register_fpe_functions from libXfont. It's required to get new version of libXfont, therefore adjust it to be passed to autoconf. Signed-off-by: Tiago Vignatti Reviewed-by: Mikhail Gusarov Reviewed-by: Alex Deucher Signed-off-by: Keith Packard Backported-to-NX-by: Mike Gabriel --- nx-X11/programs/Xserver/dix/dixfonts.c | 4 ---- nx-X11/programs/Xserver/include/dixfont.h | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'nx-X11') 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 */ -- cgit v1.2.3