diff options
| author | Javier Jardón <jjardon@gnome.org> | 2016-02-06 17:03:03 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2016-02-06 20:14:21 +0000 |
| commit | e167f136c5ae10a9e53ca6ef707a86c955635d29 (patch) | |
| tree | 0a07061ad017ceccfa776990eb0c2db6f5a9d4c8 /dix/dispatch.c | |
| parent | 2c3e8768443caa66d78775ea79bb16a5faae3a3c (diff) | |
| download | xserver-e167f136c5ae10a9e53ca6ef707a86c955635d29.tar.gz | |
Port to xfont2baserock/jjardon/xfont2
Signed-off-by: Javier Jardón <jjardon@gnome.org>
Diffstat (limited to 'dix/dispatch.c')
| -rw-r--r-- | dix/dispatch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index 53032dc64..08661f8be 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -108,7 +108,7 @@ int ProcInitialConnection(); #include "windowstr.h" #include <X11/fonts/fontstruct.h> -#include <X11/fonts/fontutil.h> +#include <X11/fonts/libxfont2.h> #include "dixfontstr.h" #include "gcstruct.h" #include "selection.h" @@ -1289,7 +1289,7 @@ ProcQueryTextExtents(ClientPtr client) return BadLength; length--; } - if (!QueryTextExtents(pFont, length, (unsigned char *) &stuff[1], &info)) + if (!xfont2_query_text_extents(pFont, length, (unsigned char *) &stuff[1], &info)) return BadAlloc; reply = (xQueryTextExtentsReply) { .type = X_Reply, |