[dvblast-devel] Fix compilation error against Linux 3.7 kernel headers.

[Georgi Chorbadzhiyski]

dvblast | branch: master | Georgi Chorbadzhiyski <gf at unixsol.org> | Tue Jan 22 17:18:33 2013 +0200| [14fa5add27cce8d1ffac893502ddd9ee3b7c7ba8] | committer: Georgi Chorbadzhiyski

Fix compilation error against Linux 3.7 kernel headers.

The for multistream checks were wrong and when dvblast was compiled
against kernel headers that contain multistream support the build
failed with:

  CC      dvb.c
  In file included from dvb.c:47:0:
  /usr/include/linux/dvb/frontend.h:65:2: error: expected identifier before numeric constant
  dvb.c: In function ‘FrontendInfo’:
  dvb.c:776:5: error: ‘FE_CAN_2G_MODULATION’ undeclared (first use in this function)
  dvb.c:776:5: note: each undeclared identifier is reported only once for each function it appears in
  dvb.c:779:5: error: ‘FE_NEEDS_BENDING’ undeclared (first use in this function)
  dvb.c:780:5: error: ‘FE_CAN_RECOVER’ undeclared (first use in this function)
  dvb.c:781:5: error: ‘FE_CAN_MUTE_TS’ undeclared (first use in this function)
  dvb.c: In function ‘FrontendSet’:
  dvb.c:1028:30: error: ‘FE_CAN_2G_MODULATION’ undeclared (first use in this function)
  make: *** [dvb.o] Error 1

> http://git.videolan.org/gitweb.cgi/dvblast.git/?a=commit;h=14fa5add27cce8d1ffac893502ddd9ee3b7c7ba8
---

 config.h |    5 -----
 dvb.c    |    5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config.h b/config.h
index e09c09c..55a32d7 100644
--- a/config.h
+++ b/config.h
@@ -29,11 +29,6 @@
 #define HAVE_DVB_SUPPORT
 #define HAVE_ASI_SUPPORT
 #define HAVE_CLOCK_NANOSLEEP
-#define HAVE_DVB_MULTISTREAM
-#if DVBAPI_VERSION < 508
-  #define DTV_STREAM_ID        42
-  #define FE_CAN_MULTISTREAM   0x4000000
-#endif
 #endif
 
 #define HAVE_ICONV
diff --git a/dvb.c b/dvb.c
index 14d5f66..6fd30d9 100644
--- a/dvb.c
+++ b/dvb.c
@@ -47,6 +47,11 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/ca.h>
 
+#if DVBAPI_VERSION < 508
+  #define DTV_STREAM_ID        42
+  #define FE_CAN_MULTISTREAM   0x4000000
+#endif
+
 #define MAX_DELIVERY_SYSTEMS 20
 
 #include "dvblast.h"