* dvblastctl.c, dvb.c: Compatibility with older DVB drivers.

dvb.c

@@ -374,7 +374,9 @@ static int FrontendDoDiseqc(void)
 
     switch ( i_voltage )
     {
+#ifdef SEC_VOLTAGE_OFF
         case 0: fe_voltage = SEC_VOLTAGE_OFF; break;
+#endif
         default:
         case 13: fe_voltage = SEC_VOLTAGE_13; break;
         case 18: fe_voltage = SEC_VOLTAGE_18; break;
@@ -739,6 +741,7 @@ static void FrontendSet( void )
                  i_frequency, i_srate );
         break;
 
+#ifdef FE_ATSC
     case FE_ATSC:
         fep.frequency = i_frequency;
 
@@ -746,6 +749,7 @@ static void FrontendSet( void )
 
         msg_Dbg( NULL, "tuning ATSC frontend to f=%d", i_frequency );
         break;
+#endif
 
     default:
         msg_Err( NULL, "unknown frontend type %d", info.type );

dvblastctl.c

@@ -308,17 +308,23 @@ int main( int i_argc, char **ppsz_argv )
         PRINT_CAPS( CAN_BANDWIDTH_AUTO );
         PRINT_CAPS( CAN_GUARD_INTERVAL_AUTO );
         PRINT_CAPS( CAN_HIERARCHY_AUTO );
+#ifdef FE_CAN_8VSB
         PRINT_CAPS( CAN_8VSB );
         PRINT_CAPS( CAN_16VSB );
+#endif
 #if DVB_API_VERSION >= 5
         PRINT_CAPS( HAS_EXTENDED_CAPS );
-        /* FIXME: apparently this doesn't exist in some versions of the
-         * linux-dvb headers */
-        /* PRINT_CAPS( CAN_2G_MODULATION ); */
+#ifdef FE_CAN_2G_MODULATION
+        PRINT_CAPS( CAN_2G_MODULATION );
+#endif
 #endif
+#ifdef FE_NEEDS_BENDING
         PRINT_CAPS( NEEDS_BENDING );
+#endif
         PRINT_CAPS( CAN_MUTE_TS );
+#ifdef FE_CAN_RECOVER
         PRINT_CAPS( CAN_RECOVER );
+#endif
 #undef PRINT_CAPS
 
         printf("\nstatus:\n");