diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-07-08 18:50:45 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-07-08 18:50:45 +0400 |
| commit | 96f17a2f73d1a29c7cdc279daa1fb7f1b7f58aff (patch) | |
| tree | eff4991614caccccefdc7d9b10f795728070159e /src/font.h | |
| parent | d64a4984c147d0c4550aa1e9e3b9a5db10b3de6a (diff) | |
| download | emacs-96f17a2f73d1a29c7cdc279daa1fb7f1b7f58aff.tar.gz emacs-96f17a2f73d1a29c7cdc279daa1fb7f1b7f58aff.tar.bz2 emacs-96f17a2f73d1a29c7cdc279daa1fb7f1b7f58aff.zip | |
* font.c (font_build_object) [HAVE_XFT || HAVE_FREETYPE || HAVE_NS]:
New function, with an intention to avoid code duplication between
a few font drivers.
* font.h (font_build_object) [HAVE_XFT || HAVE_FREETYPE || HAVE_NS]:
Add prototype.
* ftfont.c (ftfont_open):
* macfont.m (macfont_open):
* xftfont.c (xftfont_open): Use it.
Diffstat (limited to 'src/font.h')
| -rw-r--r-- | src/font.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/font.h b/src/font.h index c23b826bd46..96c030c3af1 100644 --- a/src/font.h +++ b/src/font.h @@ -719,6 +719,9 @@ extern Lisp_Object merge_font_spec (Lisp_Object, Lisp_Object); extern Lisp_Object font_make_entity (void); extern Lisp_Object font_make_object (int, Lisp_Object, int); +#if defined (HAVE_XFT) || defined (HAVE_FREETYPE) || defined (HAVE_NS) +extern Lisp_Object font_build_object (int, Lisp_Object, Lisp_Object, double); +#endif extern Lisp_Object find_font_encoding (Lisp_Object); extern int font_registry_charsets (Lisp_Object, struct charset **, |