diff options
| author | Keith Packard <keithp@keithp.com> | 2015-09-01 18:50:55 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-07-18 15:25:59 -0400 |
| commit | 05a793f5b3c40747d5a92a076def7f4fb673c7e7 (patch) | |
| tree | 222f652ac4e1b982fd45e5f79479b1caf10526d1 /dix/main.c | |
| parent | 950ffb8d6fd1480f305e38c571bda44f247f1de2 (diff) | |
dix: Switch to the libXfont2 API (v2)
This new libXfont API eliminates exposing internal X server symbols to
the font library, replacing those with a struct full of the entire API
needed to use that library.
v2: Use libXfont2 instead of libXfont_2
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'dix/main.c')
| -rw-r--r-- | dix/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/main.c b/dix/main.c index 4ba43133e..0fa561e18 100644 --- a/dix/main.c +++ b/dix/main.c @@ -96,7 +96,7 @@ Equipment Corporation. #include "selection.h" #include <X11/fonts/font.h> #include <X11/fonts/fontstruct.h> -#include <X11/fonts/fontutil.h> +#include <X11/fonts/libxfont2.h> #include "opaque.h" #include "servermd.h" #include "hotplug.h" @@ -196,7 +196,7 @@ dix_main(int argc, char *argv[], char *envp[]) InitAtoms(); InitEvents(); - InitGlyphCaching(); + xfont2_init_glyph_caching(); dixResetRegistry(); InitFonts(); InitCallbackManager(); |