diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-10 13:13:57 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-10 13:42:34 -0800 |
| commit | 649937920b5023be5c0685d1537f5ea2bfb9899a (patch) | |
| tree | dc53b01174579fe381b6b7c53cb6677028355729 /src | |
| parent | 288e1fd737265b7fc20c2c0d5a7b4ffaf26ecf66 (diff) | |
| download | emacs-649937920b5023be5c0685d1537f5ea2bfb9899a.tar.gz | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/dispextern.h | 4 | ||||
| -rw-r--r-- | src/font.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c05083590af..39775eb675c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +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. diff --git a/src/dispextern.h b/src/dispextern.h index 1a9aef103bd..161f252dd39 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -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 }; diff --git a/src/font.h b/src/font.h index d12ae2c09bb..5a3e38a2a6e 100644 --- a/src/font.h +++ b/src/font.h @@ -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); |