aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/dixfont.h
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-12-16 03:55:58 +0100
committerMihai Moldovan <ionic@ionic.de>2017-12-16 04:05:34 +0100
commitfe011b55df68b7419a8042db94fc3fd1bcaca497 (patch)
tree4bc944eb7ee4b536f7a60f05c55d7302616eb243 /nx-X11/programs/Xserver/include/dixfont.h
parentfb2e9a8b54b0e404d76fe93b969e47a8209d1532 (diff)
downloadnx-libs-fe011b55df68b7419a8042db94fc3fd1bcaca497.tar.gz
nx-libs-fe011b55df68b7419a8042db94fc3fd1bcaca497.tar.bz2
nx-libs-fe011b55df68b7419a8042db94fc3fd1bcaca497.zip
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.
Diffstat (limited to 'nx-X11/programs/Xserver/include/dixfont.h')
-rw-r--r--nx-X11/programs/Xserver/include/dixfont.h4
1 files changed, 4 insertions, 0 deletions
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*/,