Mercurial > mplayer.hg

changeset 36525:8303442b7870

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add #ifdef to avoid warnings. This is related to r36585 and hasn't been fixed there properly. Additionally, combine the definitions of conditional variables.
author ib
date Sun, 19 Jan 2014 00:01:21 +0000
parents 7cc28c760146
children e0d75c4ad96b
files gui/dialog/preferences.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gui/dialog/preferences.c	Sat Jan 18 23:38:50 2014 +0000
+++ b/gui/dialog/preferences.c	Sun Jan 19 00:01:21 2014 +0000
@@ -550,8 +550,12 @@
   GtkWidget * vbox6;
   GtkWidget * vbox600;
   GSList    * OSD_group = NULL;
+#ifdef CONFIG_FREETYPE
   GSList    * Font_group = NULL;
   GList     * CBFontEncoding_items = NULL;
+#else
+  GtkWidget * hbox7;
+#endif
 #ifdef CONFIG_ICONV
   GList	    * CBSubEncoding_items = NULL;
 #endif
@@ -562,9 +566,6 @@
   GtkWidget * vbox603;
   GtkWidget * hbox6;
   GtkWidget * hbuttonbox5;
-#ifndef CONFIG_FREETYPE
-  GtkWidget * hbox7;
-#endif
   GtkWidget * vbox601;
   GtkWidget * vbox602;
   GtkWidget * hbox5;