Mercurial > mplayer.hg

changeset 31397:4d6bb9606833

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove includes that break building if X11 is not available.
author reimar
date Fri, 18 Jun 2010 16:17:37 +0000
parents 921a7fb81ebc
children b240cee8506d
files cfg-mplayer.h gui/app.h gui/interface.h
diffstat 3 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-mplayer.h	Fri Jun 18 16:16:38 2010 +0000
+++ b/cfg-mplayer.h	Fri Jun 18 16:17:37 2010 +0000
@@ -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"
 
--- a/gui/app.h	Fri Jun 18 16:16:38 2010 +0000
+++ b/gui/app.h	Fri Jun 18 16:17:37 2010 +0000
@@ -189,7 +189,6 @@
 extern char      * skinDirInHome_obsolete;
 extern char      * skinMPlayerDir;
 extern char      * skinMPlayerDir_obsolete;
-extern char      * skinName;
 
 void appInitStruct( listItems * item );
 void appClearItem( wItem * item );
--- a/gui/interface.h	Fri Jun 18 16:16:38 2010 +0000
+++ b/gui/interface.h	Fri Jun 18 16:17:37 2010 +0000
@@ -184,6 +184,7 @@
  char    * url;
 } URLItem;
 
+extern char   * skinName;
 extern plItem * plList;
 extern plItem * plCurrent;
 extern plItem * plLastPlayed;