diff options
| author | Dmitry Antipov | 2013-12-09 20:30:52 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-12-09 20:30:52 +0400 |
| commit | ad8a47b89fc3c5a3302255f318b1ed805838cf72 (patch) | |
| tree | 8e7a9663d42cb9fd4f35148ddd18a4f1daa3232b /src | |
| parent | a1099a91df2596511073422c90e8fdf84f5c5b63 (diff) | |
| download | emacs-ad8a47b89fc3c5a3302255f318b1ed805838cf72.tar.gz emacs-ad8a47b89fc3c5a3302255f318b1ed805838cf72.zip | |
* gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]:
Avoid unused macro warning if configured --without-xft.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/gtkutil.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 159bf04075e..0970bf62b52 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-12-09 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]: | ||
| 4 | Avoid unused macro warning if configured --without-xft. | ||
| 5 | |||
| 1 | 2013-12-09 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2013-12-09 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * alloc.c (Fmemory_limit): Avoid compiler warning. Return 0 always. | 8 | * alloc.c (Fmemory_limit): Avoid compiler warning. Return 0 always. |
diff --git a/src/gtkutil.c b/src/gtkutil.c index 8f007dad868..e5d6414cf75 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -78,6 +78,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 78 | #define remove_submenu(w) gtk_menu_item_remove_submenu ((w)) | 78 | #define remove_submenu(w) gtk_menu_item_remove_submenu ((w)) |
| 79 | #endif | 79 | #endif |
| 80 | 80 | ||
| 81 | #ifdef HAVE_FREETYPE | ||
| 81 | #if GTK_CHECK_VERSION (3, 2, 0) | 82 | #if GTK_CHECK_VERSION (3, 2, 0) |
| 82 | #define USE_NEW_GTK_FONT_CHOOSER 1 | 83 | #define USE_NEW_GTK_FONT_CHOOSER 1 |
| 83 | #else | 84 | #else |
| @@ -89,6 +90,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 89 | #define gtk_font_chooser_set_font(x, y) \ | 90 | #define gtk_font_chooser_set_font(x, y) \ |
| 90 | gtk_font_selection_dialog_set_font_name (x, y) | 91 | gtk_font_selection_dialog_set_font_name (x, y) |
| 91 | #endif | 92 | #endif |
| 93 | #endif /* HAVE_FREETYPE */ | ||
| 92 | 94 | ||
| 93 | #ifndef HAVE_GTK3 | 95 | #ifndef HAVE_GTK3 |
| 94 | #ifdef USE_GTK_TOOLTIP | 96 | #ifdef USE_GTK_TOOLTIP |