diff options
author | Mihai Moldovan <ionic@ionic.de> | 2015-04-22 08:38:21 +0200 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-22 08:38:21 +0200 |
commit | b964406ba6e7e2d65b88010856ce881ee928898a (patch) | |
tree | 2c37d81d17f33bf288c3a44adc11bc328ee8e697 /nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c | |
parent | a77ca871c6c1b0d6d866f95e4eb6e013f92e9627 (diff) | |
parent | 70b77a0fc329e2e205a596a738c7307d354e7b1c (diff) | |
download | nx-libs-b964406ba6e7e2d65b88010856ce881ee928898a.tar.gz nx-libs-b964406ba6e7e2d65b88010856ce881ee928898a.tar.bz2 nx-libs-b964406ba6e7e2d65b88010856ce881ee928898a.zip |
Merge branch 'sunweaver-pr/libxfont-cleanup' into arctica-3.6.x
Attributes GH PR #14: https://github.com/ArcticaProject/nx-libs/pull/14
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c index 2b642692f..922443633 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c @@ -82,6 +82,7 @@ Equipment Corporation. #include "cursorstr.h" #include "misc.h" #include "opaque.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "closestr.h" @@ -2116,22 +2117,7 @@ InitFonts () { patternCache = MakeFontPatternCache(); -#ifndef KDRIVESERVER - if (screenInfo.numScreens > screenInfo.numVideoScreens) { - PrinterFontRegisterFpeFunctions(); - FontFileCheckRegisterFpeFunctions(); - check_fs_register_fpe_functions(); - } else -#endif - { -#ifdef KDRIVESERVER - BuiltinRegisterFpeFunctions(); -#endif - FontFileRegisterFpeFunctions(); -#ifndef NOFONTSERVERACCESS - fs_register_fpe_functions(); -#endif - } + register_fpe_functions(); } int |