* gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]:

Avoid unused macro warning if configured --without-xft.

diff --git a/src/ChangeLog b/src/ChangeLog
index 159bf04075ed192897f9842f36a09e851c736730..0970bf62b52d1597d49b2f1659b898216a1307ec 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-09  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]:
+       Avoid unused macro warning if configured --without-xft.
+
 2013-12-09  Jan Djärv  <jan.h.d@swipnet.se>
 
        * alloc.c (Fmemory_limit): Avoid compiler warning.  Return 0 always.

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 8f007dad868d3d29dde52754a2c0e027e2579b87..e5d6414cf75d3e06bfb17d325dbc378ff4c5365e 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -78,6 +78,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define remove_submenu(w) gtk_menu_item_remove_submenu ((w))
 #endif
 
+#ifdef HAVE_FREETYPE
 #if GTK_CHECK_VERSION (3, 2, 0)
 #define USE_NEW_GTK_FONT_CHOOSER 1
 #else
@@ -89,6 +90,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define  gtk_font_chooser_set_font(x, y) \
   gtk_font_selection_dialog_set_font_name (x, y)
 #endif
+#endif /* HAVE_FREETYPE */
 
 #ifndef HAVE_GTK3
 #ifdef USE_GTK_TOOLTIP