[MPlayer-cvslog] r31463 - in trunk: cfg-mplayer.h gui/app.h gui/interface.h

[reimar]

Author: reimar
Date: Fri Jun 18 18:17:37 2010
New Revision: 31463

Log:
Remove includes that break building if X11 is not available.

Modified:
   trunk/cfg-mplayer.h
   trunk/gui/app.h
   trunk/gui/interface.h

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	Fri Jun 18 18:16:38 2010	(r31462)
+++ trunk/cfg-mplayer.h	Fri Jun 18 18:17:37 2010	(r31463)
@@ -24,7 +24,6 @@
  */
 
 #include "cfg-common.h"
-#include "gui/app.h"
 #include "gui/interface.h"
 #include "input/lirc.h"
 #include "libmpcodecs/vd.h"
@@ -34,7 +33,6 @@
 #include "libvo/vo_dxr2.h"
 #include "libvo/vo_fbdev.h"
 #include "libvo/vo_zr.h"
-#include "libvo/x11_common.h"
 #include "mp_fifo.h"
 #include "unrar_exec.h"
 

Modified: trunk/gui/app.h
==============================================================================
--- trunk/gui/app.h	Fri Jun 18 18:16:38 2010	(r31462)
+++ trunk/gui/app.h	Fri Jun 18 18:17:37 2010	(r31463)
@@ -189,7 +189,6 @@ extern char      * skinDirInHome;
 extern char      * skinDirInHome_obsolete;
 extern char      * skinMPlayerDir;
 extern char      * skinMPlayerDir_obsolete;
-extern char      * skinName;
 
 void appInitStruct( listItems * item );
 void appClearItem( wItem * item );

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Fri Jun 18 18:16:38 2010	(r31462)
+++ trunk/gui/interface.h	Fri Jun 18 18:17:37 2010	(r31463)
@@ -184,6 +184,7 @@ typedef struct urlItem
  char    * url;
 } URLItem;
 
+extern char   * skinName;
 extern plItem * plList;
 extern plItem * plCurrent;
 extern plItem * plLastPlayed;