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 /Xext | |
| 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 'Xext')
| -rw-r--r-- | Xext/xf86bigfont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index 97596ea5f..f2584c221 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -437,7 +437,7 @@ ProcXF86BigfontQueryFont(ClientPtr client) #ifdef HAS_SHM if (pDesc && !badSysCall) { *(CARD32 *) (pCI + nCharInfos) = signature; - if (!FontSetPrivate(pFont, FontShmdescIndex, pDesc)) { + if (!xfont2_font_set_private(pFont, FontShmdescIndex, pDesc)) { shmdealloc(pDesc); return BadAlloc; } @@ -721,7 +721,7 @@ XFree86BigfontExtensionInit(void) + (unsigned int) (65536.0 / (RAND_MAX + 1.0) * rand()); /* fprintf(stderr, "signature = 0x%08X\n", signature); */ - FontShmdescIndex = AllocateFontPrivateIndex(); + FontShmdescIndex = xfont2_allocate_font_private_index(); #if !defined(CSRG_BASED) && !defined(__CYGWIN__) pagesize = SHMLBA; |