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/dispextern.h | |
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/dispextern.h')
-rw-r--r-- | src/dispextern.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 }; |