From 24ce6a0214e7b885363990e07dabf2935a8c1e11 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Tue, 10 Jun 2014 07:32:36 +0400 Subject: * dispextern.h (struct face) [HAVE_XFT]: Ifdef 'extra' member. * font.c (font_done_for_face): * xface.c (realize_non_ascii_face): Adjust user. * font.h (struct font_driver): Convert 'prepare_face' to return void because its return value is never used anyway. * xfont.c (xfont_prepare_face): Return void. * xftfont.c (xftfont_prepare_face): Likewise. Use xmalloc. (xftfont_done_face): Use xfree. --- src/font.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/font.h') diff --git a/src/font.h b/src/font.h index 4a525573cc2..42137deeaa4 100644 --- a/src/font.h +++ b/src/font.h @@ -564,11 +564,9 @@ struct font_driver /* Close FONT. NOTE: this can be called by GC. */ void (*close) (struct font *font); - /* Optional (if FACE->extra is not used). - Prepare FACE for displaying characters by FONT on frame F by - storing some data in FACE->extra. If successful, return 0. - Otherwise, return -1. */ - int (*prepare_face) (struct frame *f, struct face *face); + /* Prepare FACE for displaying characters by FONT on frame F by + storing some data in FACE->extra. */ + void (*prepare_face) (struct frame *f, struct face *face); /* Optional. Done FACE for displaying characters by FACE->font on frame F. */ -- cgit v1.2.3