diff options
Diffstat (limited to 'src/font.h')
| -rw-r--r-- | src/font.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/font.h b/src/font.h index d3e15306427..2da5ec45047 100644 --- a/src/font.h +++ b/src/font.h @@ -69,9 +69,10 @@ INLINE_HEADER_BEGIN enum font_property_index { - /* FONT-TYPE is a symbol indicating a font backend; currently `x' - and `xft' are available on X, `uniscribe' and `gdi' on - Windows, and `ns' under Cocoa / GNUstep. */ + /* FONT-TYPE is a symbol indicating a font backend; currently `x', + `xft', `xfthb', `ftrc', and `ftcrhb' are available on X; + `harfbuzz', `uniscribe', and `gdi' on Windows, and `ns' under + Cocoa / GNUstep. */ FONT_TYPE_INDEX, /* FONT-FOUNDRY is a foundry name (symbol). */ @@ -885,7 +886,7 @@ valid_font_driver (struct font_driver const *d) extern Lisp_Object font_update_drivers (struct frame *f, Lisp_Object list); extern Lisp_Object font_range (ptrdiff_t, ptrdiff_t, ptrdiff_t *, struct window *, struct face *, - Lisp_Object); + Lisp_Object, int); extern void font_fill_lglyph_metrics (Lisp_Object, struct font *, unsigned int); extern Lisp_Object font_put_extra (Lisp_Object font, Lisp_Object prop, @@ -964,7 +965,7 @@ extern struct font_driver const nsfont_driver; extern void syms_of_nsfont (void); extern void syms_of_macfont (void); #endif /* HAVE_NS */ -#ifdef USE_CAIRO +#if defined (USE_CAIRO) || defined (USE_BE_CAIRO) extern struct font_driver const ftcrfont_driver; #ifdef HAVE_HARFBUZZ extern struct font_driver ftcrhbfont_driver; @@ -998,7 +999,7 @@ extern void font_deferred_log (const char *, Lisp_Object, Lisp_Object); INLINE bool font_data_structures_may_be_ill_formed (void) { -#ifdef USE_CAIRO +#if defined USE_CAIRO || defined USE_BE_CAIRO /* Although this works around Bug#20890, it is probably not the right thing to do. */ return gc_in_progress; |