[Emacs-diffs] trunk r115440: * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]:

[Dmitry Antipov]

------------------------------------------------------------
revno: 115440
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-09 20:30:52 +0400
message:
  * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]:
  Avoid unused macro warning if configured --without-xft.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/gtkutil.c                  gtkutil.c-20091113204419-o5vbwnq5f7feedwu-2527

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-09 08:23:01 +0000
+++ b/src/ChangeLog     2013-12-09 16:30:52 +0000
@@ -1,3 +1,8 @@
+2013-12-09  Dmitry Antipov  <address@hidden>
+
+       * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]:
+       Avoid unused macro warning if configured --without-xft.
+
 2013-12-09  Jan Djärv  <address@hidden>
 
        * alloc.c (Fmemory_limit): Avoid compiler warning.  Return 0 always.

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2013-12-07 17:41:02 +0000
+++ b/src/gtkutil.c     2013-12-09 16:30:52 +0000
@@ -78,6 +78,7 @@
 #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 @@
 #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