diff options
| author | Paul Eggert | 2019-11-14 14:00:07 -0800 |
|---|---|---|
| committer | Paul Eggert | 2019-11-14 14:02:03 -0800 |
| commit | 2241f7ca7adb8aa7d785174dec0280a07cd16479 (patch) | |
| tree | 596070d1698863b211c021c5b195a6094070949c /src/font.c | |
| parent | 6a2a371c288a13060c44fa1af3ab73db611705a4 (diff) | |
| download | emacs-2241f7ca7adb8aa7d785174dec0280a07cd16479.tar.gz emacs-2241f7ca7adb8aa7d785174dec0280a07cd16479.zip | |
In Cairo builds, omit some unnecessary functions
* src/font.c (fset_font_data, font_put_frame_data)
(font_get_frame_data):
* src/ftfont.c (ftfont_open, ftfont_close)
(ftfont_encode_char, ftfont_glyph_metrics)
(ftfont_text_extents, ftfont_driver):
Define only if USE_CAIRO.
* src/xdisp.c (tty_handle_tab_bar_click):
Define only if HAVE_NTGUI && !CYGWIN.
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/font.c b/src/font.c index 7c8e9e30c9d..b987a453d66 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -3650,7 +3650,7 @@ font_update_drivers (struct frame *f, Lisp_Object new_drivers) | |||
| 3650 | return active_drivers; | 3650 | return active_drivers; |
| 3651 | } | 3651 | } |
| 3652 | 3652 | ||
| 3653 | #if defined (HAVE_XFT) || defined (HAVE_FREETYPE) | 3653 | #if (defined HAVE_XFT || defined HAVE_FREETYPE) && !defined USE_CAIRO |
| 3654 | 3654 | ||
| 3655 | static void | 3655 | static void |
| 3656 | fset_font_data (struct frame *f, Lisp_Object val) | 3656 | fset_font_data (struct frame *f, Lisp_Object val) |
| @@ -3683,7 +3683,7 @@ font_get_frame_data (struct frame *f, Lisp_Object driver) | |||
| 3683 | return NILP (val) ? NULL : xmint_pointer (XCDR (val)); | 3683 | return NILP (val) ? NULL : xmint_pointer (XCDR (val)); |
| 3684 | } | 3684 | } |
| 3685 | 3685 | ||
| 3686 | #endif /* HAVE_XFT || HAVE_FREETYPE */ | 3686 | #endif /* (HAVE_XFT || HAVE_FREETYPE) && !USE_CAIRO */ |
| 3687 | 3687 | ||
| 3688 | /* Sets attributes on a font. Any properties that appear in ALIST and | 3688 | /* Sets attributes on a font. Any properties that appear in ALIST and |
| 3689 | BOOLEAN_PROPERTIES or NON_BOOLEAN_PROPERTIES are set on the font. | 3689 | BOOLEAN_PROPERTIES or NON_BOOLEAN_PROPERTIES are set on the font. |