summaryrefslogtreecommitdiff
path: root/src/font.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-11-14 14:00:07 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2019-11-14 14:02:03 -0800
commit2241f7ca7adb8aa7d785174dec0280a07cd16479 (patch)
tree596070d1698863b211c021c5b195a6094070949c /src/font.c
parent6a2a371c288a13060c44fa1af3ab73db611705a4 (diff)
downloademacs-2241f7ca7adb8aa7d785174dec0280a07cd16479.tar.gz
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.c4
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)
return active_drivers;
}
-#if defined (HAVE_XFT) || defined (HAVE_FREETYPE)
+#if (defined HAVE_XFT || defined HAVE_FREETYPE) && !defined USE_CAIRO
static void
fset_font_data (struct frame *f, Lisp_Object val)
@@ -3683,7 +3683,7 @@ font_get_frame_data (struct frame *f, Lisp_Object driver)
return NILP (val) ? NULL : xmint_pointer (XCDR (val));
}
-#endif /* HAVE_XFT || HAVE_FREETYPE */
+#endif /* (HAVE_XFT || HAVE_FREETYPE) && !USE_CAIRO */
/* Sets attributes on a font. Any properties that appear in ALIST and
BOOLEAN_PROPERTIES or NON_BOOLEAN_PROPERTIES are set on the font.