From fe011b55df68b7419a8042db94fc3fd1bcaca497 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Sat, 16 Dec 2017 03:55:58 +0100 Subject: Support building with legacy (pre-1.4.2) libXfont(1) versions. Partly reverts ec30a857eb0d67b232f8d43e63a6370023f4c4d0, but in a forward-compatible manner. Legacy libXfont1 versions are automatically detected by the main Makefile. --- nx-X11/programs/Xserver/dix/dixfonts.c | 6 ++++++ nx-X11/programs/Xserver/include/dixfont.h | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index 98d2a6439..0d90cd7b0 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -2139,7 +2139,13 @@ InitFonts () ResetFontPrivateIndex(); +#ifdef LEGACY_XFONT1 + BuiltinRegisterFpeFunctions(); + FontFileRegisterFpeFunctions(); + fs_register_fpe_functions(); +#else register_fpe_functions(); +#endif } #endif /* HAS_XFONT2 */ diff --git a/nx-X11/programs/Xserver/include/dixfont.h b/nx-X11/programs/Xserver/include/dixfont.h index 21d917fe5..9ae55157e 100644 --- a/nx-X11/programs/Xserver/include/dixfont.h +++ b/nx-X11/programs/Xserver/include/dixfont.h @@ -152,7 +152,11 @@ extern void dixGetGlyphs(FontPtr /*font*/, unsigned long * /*glyphcount*/, CharInfoPtr * /*glyphs*/); +#ifdef LEGACY_XFONT1 +extern void BuiltinRegisterFpeFunctions(void); +#else extern void register_fpe_functions(void); +#endif extern void QueryGlyphExtents(FontPtr /*pFont*/, CharInfoPtr * /*charinfo*/, -- cgit v1.2.3