[Emacs-diffs] master 6499379 3/4: Port to HAVE_FREETYPE && !HAVE_XFT

[Paul Eggert]

branch: master
commit 649937920b5023be5c0685d1537f5ea2bfb9899a
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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.
---
 src/ChangeLog    |    7 +++++++
 src/dispextern.h |    4 ++--
 src/font.h       |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index c050835..39775eb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-10  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * w32fns.c (Fw32_register_hot_key): Use XINT instead of XLI.
diff --git a/src/dispextern.h b/src/dispextern.h
index 1a9aef1..161f252 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 d12ae2c..5a3e38a 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);