[dahdi-commits] tzafrir: tools/trunk r9076 - in /tools/trunk: dahdi_maint.c dahdi_scan.c

[SVN commits to the DAHDI project]

Author: tzafrir
Date: Sun Aug  1 17:39:41 2010
New Revision: 9076

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9076
Log:
fix build of dahdi_scan and dahdi_maint with -linux 2.3

New functionality that was added in r8992 and r8993 uses new items
defined only in dahdi-linux trunk (and eventually: 2.4).

As in both cases it's a single place to check, we'll just ifdef it away.

Modified:
    tools/trunk/dahdi_maint.c
    tools/trunk/dahdi_scan.c

Modified: tools/trunk/dahdi_maint.c
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/dahdi_maint.c?view=diff&rev=9076&r1=9075&r2=9076
==============================================================================
--- tools/trunk/dahdi_maint.c (original)
+++ tools/trunk/dahdi_maint.c Sun Aug  1 17:39:41 2010
@@ -197,9 +197,11 @@
 		} else if (!strcasecmp(iarg, "bipolar")) {
 			m.command = DAHDI_MAINT_BIPOLAR_DEFECT;
 			printf("Inserting a single bipolar defect\n");
+#ifdef DAHDI_MAINT_ALARM_SIM
 		} else if (!strcasecmp(iarg, "sim")) {
 			m.command = DAHDI_MAINT_ALARM_SIM;
 			printf("Incrementing alarm simulator\n");
+#endif
 		} else {
 			display_help(argv[0], 1);
 		}

Modified: tools/trunk/dahdi_scan.c
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/dahdi_scan.c?view=diff&rev=9076&r1=9075&r2=9076
==============================================================================
--- tools/trunk/dahdi_scan.c (original)
+++ tools/trunk/dahdi_scan.c Sun Aug  1 17:39:41 2010
@@ -90,10 +90,12 @@
 				strcat(alarms, "YEL/");
 			if (s.alarms & DAHDI_ALARM_RED) {
 				strcat(alarms, "RED/");
+#ifdef DAHDI_ALARM_LFA
 				if (s.alarms & DAHDI_ALARM_LFA)
 					strcat(alarms, "LFA/");
 				if (s.alarms & DAHDI_ALARM_LMFA)
 					strcat(alarms, "LMFA/");
+#endif /* ifdef DAHDI_ALARM_LFA */
 			}
 			if (s.alarms & DAHDI_ALARM_LOOPBACK)
 				strcat(alarms,"LB/");