From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 10 Jan 2015 21:13:57 +0000 (-0800)
Subject: Port to HAVE_FREETYPE && !HAVE_XFT
X-Git-Tag: emacs-25.0.90~2605^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=649937920b5023be5c0685d1537f5ea2bfb9899a;p=emacs.git

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.
---

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);