Commit f5075377 authored by Paul Eggert's avatar Paul Eggert

* font.c, font.h (font_unparse_fcname): Now static.

Define only if HAVE_XFT || HAVE_FREETYPE || HAVE_NS.
parent 140ea213
2014-07-09 Paul Eggert <eggert@cs.ucla.edu>
* font.c, font.h (font_unparse_fcname): Now static.
Define only if HAVE_XFT || HAVE_FREETYPE || HAVE_NS.
2014-07-09 Dmitry Antipov <dmantipov@yandex.ru>
Next minor cleanup of font subsystem.
......
......@@ -227,6 +227,8 @@ font_make_object (int size, Lisp_Object entity, int pixelsize)
#if defined (HAVE_XFT) || defined (HAVE_FREETYPE) || defined (HAVE_NS)
static int font_unparse_fcname (Lisp_Object, int, char *, int);
/* Like above, but also set `type', `name' and `fullname' properties
of font-object. */
......@@ -1599,11 +1601,14 @@ font_parse_fcname (char *name, ptrdiff_t len, Lisp_Object font)
return 0;
}
#if defined HAVE_XFT || defined HAVE_FREETYPE || defined HAVE_NS
/* Store fontconfig's font name of FONT (font-spec or font-entity) in
NAME (NBYTES length), and return the name length. If
FONT_SIZE_INDEX of FONT is 0, use PIXEL_SIZE instead. */
FONT_SIZE_INDEX of FONT is 0, use PIXEL_SIZE instead.
Return a negative value on error. */
int
static int
font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes)
{
Lisp_Object family, foundry;
......@@ -1724,6 +1729,8 @@ font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes)
return (p - name);
}
#endif
/* Parse NAME (null terminated) and store information in FONT
(font-spec or font-entity). If NAME is successfully parsed, return
0. Otherwise return -1. */
......
......@@ -752,8 +752,6 @@ extern void font_parse_family_registry (Lisp_Object family,
extern int font_parse_xlfd (char *name, ptrdiff_t len, Lisp_Object font);
extern ptrdiff_t font_unparse_xlfd (Lisp_Object font, int pixel_size,
char *name, int bytes);
extern int font_unparse_fcname (Lisp_Object font, int pixel_size,
char *name, int bytes);
extern void register_font_driver (struct font_driver *driver, struct frame *f);
extern void free_font_driver_list (struct frame *f);
#ifdef ENABLE_CHECKING
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment