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 <tiago.vignatti@nokia.com> 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 <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

dix: use one single function to register fpe fonts
ec30a857 · Tiago Vignatti · Mihai Moldovan · 7bf44462 · ec30a857 · ec30a857
Commit ec30a857 authored Feb 09, 2017 by Tiago Vignatti Committed by Mihai Moldovan Mar 01, 2017
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 8 deletions

dixfonts.c nx-X11/programs/Xserver/dix/dixfonts.c +0 -4

dixfont.h nx-X11/programs/Xserver/include/dixfont.h +1 -4

No files found.
--- 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

--- 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 */