[MPlayer-cvslog] r36621 - trunk/gui/dialog/preferences.c

[ib]

Author: ib
Date: Sun Jan 19 01:01:21 2014
New Revision: 36621

Log:
Add #ifdef to avoid warnings.

This is related to r36585 and hasn't been fixed there properly.

Additionally, combine the definitions of conditional variables.

Modified:
   trunk/gui/dialog/preferences.c

Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c	Sun Jan 19 00:38:50 2014	(r36620)
+++ trunk/gui/dialog/preferences.c	Sun Jan 19 01:01:21 2014	(r36621)
@@ -550,8 +550,12 @@ static GtkWidget * CreatePreferences( vo
   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 @@ static GtkWidget * CreatePreferences( vo
   GtkWidget * vbox603;
   GtkWidget * hbox6;
   GtkWidget * hbuttonbox5;
-#ifndef CONFIG_FREETYPE
-  GtkWidget * hbox7;
-#endif
   GtkWidget * vbox601;
   GtkWidget * vbox602;
   GtkWidget * hbox5;