[vlc-commits] DTV: do not assume __linux__ == HAVE_LINUX_DVB

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug 11 23:16:38 2012 +0300| [96991da8c0c00da76c552d2cf9daadf3fb531f90] | committer: Rémi Denis-Courmont

DTV: do not assume __linux__ == HAVE_LINUX_DVB

This should fix DVB on *BSD.
(cherry picked from commit bfcefbf2b35650c8149ed9e94890f669187c8a50)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=96991da8c0c00da76c552d2cf9daadf3fb531f90
---

 modules/access/Modules.am   |    1 +
 modules/access/dtv/access.c |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index be8c47b..ff6047e 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -192,6 +192,7 @@ libdtv_plugin_la_DEPENDENCIES =
 
 if HAVE_LINUX_DVB
 libdtv_plugin_la_SOURCES += dtv/linux.c
+libdtv_plugin_la_CFLAGS += -DHAVE_LINUX_DVB
 if HAVE_DVBPSI
 libdtv_plugin_la_SOURCES += dtv/en50221.c dtv/en50221.h
 libdtv_plugin_la_CFLAGS += -DHAVE_DVBPSI $(DVBPSI_CFLAGS)
diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
index 624cb76..d72fad6 100644
--- a/modules/access/dtv/access.c
+++ b/modules/access/dtv/access.c
@@ -198,7 +198,7 @@ static const char *const polarization_user[] = { N_("Unspecified (0V)"),
     "low noise block-downconverters (LNB) through a DiSEqC 1.0 switch, " \
     "the correct LNB can be selected (1 to 4). " \
     "If there is no switch, this parameter should be 0.")
-#ifdef __linux__
+#ifdef HAVE_LINUX_DVB
 static const int satno_vlc[] = { 0, 1, 2, 3, 4 };
 static const char *const satno_user[] = { N_("Unspecified"),
     "A/1", "B/2", "C/3", "D/4" };
@@ -242,7 +242,7 @@ vlc_module_begin ()
 #endif
                  )
 
-#ifdef __linux__
+#ifdef HAVE_LINUX_DVB
     add_integer ("dvb-adapter", 0, ADAPTER_TEXT, ADAPTER_LONGTEXT, false)
         change_integer_range (0, 255)
         change_safe ()
@@ -366,7 +366,7 @@ vlc_module_begin ()
         change_integer_range (0, 18)
         change_private ()
         change_safe ()
-#ifdef __linux__
+#ifdef HAVE_LINUX_DVB
     add_bool ("dvb-high-voltage", false,
               HIGH_VOLTAGE_TEXT, HIGH_VOLTAGE_LONGTEXT, false)
 #endif
@@ -380,7 +380,7 @@ vlc_module_begin ()
                  LNB_SWITCH_TEXT, LNB_SWITCH_LONGTEXT, true)
         change_integer_range (0, 0x7fffffff)
     add_obsolete_integer ("dvb-lnb-slof") /* since 2.0.0 */
-#ifdef __linux__
+#ifdef HAVE_LINUX_DVB
     add_integer ("dvb-satno", 0, SATNO_TEXT, SATNO_LONGTEXT, true)
         change_integer_list (satno_vlc, satno_user)
     add_integer ("dvb-tone", -1, TONE_TEXT, TONE_LONGTEXT, true)