Commit 64993792 authored by Paul Eggert's avatar Paul Eggert

Port to HAVE_FREETYPE && !HAVE_XFT

* dispextern.h (struct face.extra) [HAVE_FREETYPE && !HAVE_XFT]:
* font.h (syms_of_xftfont) [HAVE_FREETYPE && !HAVE_XFT]:
Declare in this case too.
parent 288e1fd7
2015-01-10 Paul Eggert <eggert@cs.ucla.edu>
Port to HAVE_FREETYPE && !HAVE_XFT
* dispextern.h (struct face.extra) [HAVE_FREETYPE && !HAVE_XFT]:
* font.h (syms_of_xftfont) [HAVE_FREETYPE && !HAVE_XFT]:
Declare in this case too.
2015-01-10 Eli Zaretskii <eliz@gnu.org>
* w32fns.c (Fw32_register_hot_key): Use XINT instead of XLI.
......
......@@ -1716,8 +1716,8 @@ struct face
attributes except the font. */
struct face *ascii_face;
#ifdef HAVE_XFT
/* Extra member that a font-driver uses privately. */
#if defined HAVE_XFT || defined HAVE_FREETYPE
/* Extra member that a font-driver uses privately. */
void *extra;
#endif
};
......
......@@ -780,10 +780,10 @@ extern void syms_of_xfont (void);
extern void syms_of_ftxfont (void);
#ifdef HAVE_XFT
extern struct font_driver xftfont_driver;
extern void syms_of_xftfont (void);
#endif
#if defined HAVE_FREETYPE || defined HAVE_XFT
extern struct font_driver ftxfont_driver;
extern void syms_of_xftfont (void);
#endif
#ifdef HAVE_BDFFONT
extern void syms_of_bdffont (void);
......
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