From 64d5279410abe31e6a77c30b1a5c65dc9167eb5e Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 2 Aug 2009 16:00:55 +0000
Subject: Remove pointless #ifdefs around harmless internal header #includes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29471 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mplayer.c | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'mplayer.c')

diff --git a/mplayer.c b/mplayer.c
index d64f5268e2..d83855da99 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -72,9 +72,7 @@
 #include "osdep/getch2.h"
 #include "osdep/timer.h"
 
-#ifdef CONFIG_GUI
 #include "gui/interface.h"
-#endif
 
 #include "input/input.h"
 
@@ -100,17 +98,10 @@ char *heartbeat_cmd;
 #endif /* __linux__ */
 #endif /* HAVE_RTC */
 
-#ifdef CONFIG_TV
 #include "stream/tv.h"
-#endif
-#ifdef CONFIG_RADIO
 #include "stream/stream_radio.h"
-#endif
-
-#ifdef CONFIG_DVBIN
 #include "stream/dvbin.h"
 #include "stream/cache2.h"
-#endif
 
 //**************************************************************************//
 //             Playtree
@@ -161,10 +152,7 @@ static int max_framesize=0;
 #ifdef CONFIG_DVDREAD
 #include "stream/stream_dvd.h"
 #endif
-
-#ifdef CONFIG_DVDNAV
 #include "stream/stream_dvdnav.h"
-#endif
 
 #include "libmpcodecs/dec_audio.h"
 #include "libmpcodecs/dec_video.h"
@@ -320,10 +308,8 @@ char *vobsub_name=NULL;
 int   subcc_enabled=0;
 int suboverlap_enabled = 1;
 
-#ifdef CONFIG_ASS
 #include "libass/ass.h"
 #include "libass/ass_mp.h"
-#endif
 
 char* current_module=NULL; // for debugging
 
-- 
cgit v1.2.3


From 3fde5bd68bc3550a1caf171a2f45681ed85b2cfa Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 3 Aug 2009 16:31:55 +0000
Subject: Only #include stream/dvbin.h when DVB is enabled. dvbin.h #includes
 some system DVB headers that may be unavailable. Fixes compilation with DVB
 disabled.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29474 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mplayer.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mplayer.c')

diff --git a/mplayer.c b/mplayer.c
index d83855da99..3189855558 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -100,7 +100,9 @@ char *heartbeat_cmd;
 
 #include "stream/tv.h"
 #include "stream/stream_radio.h"
+#ifdef CONFIG_DVBIN
 #include "stream/dvbin.h"
+#endif
 #include "stream/cache2.h"
 
 //**************************************************************************//
-- 
cgit v1.2.3