From 9b19d72862ec030327b619472a0fdd12ace7a4c0 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Mon, 5 Dec 2005 11:58:35 +0000
Subject: Fix -Wundef warnings found when compiling i386 LINT, GENERIC and
 custom kernels.

---
 sys/i4b/layer1/itjc/i4b_itjc_pci.c | 2 +-
 sys/i4b/layer2/i4b_l2timer.c       | 8 ++++----
 sys/i4b/layer4/i4b_i4bdrv.c        | 2 +-
 sys/i4b/layer4/i4b_l4.c            | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'sys/i4b')

diff --git a/sys/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
index 773a84d..cbb14e1 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
@@ -1901,7 +1901,7 @@ itjc_bchannel_setup(int unit, int h_chan, int bprot, int activate)
 static void
 itjc_bchannel_start(int unit, int h_chan)
 {
-#if Buggy_code
+#if 0 /* Buggy code */
 	/*
 	 * I disabled this routine because it was causing crashes when
 	 * this driver was used with the ISP (kernel SPPP) protocol driver.
diff --git a/sys/i4b/layer2/i4b_l2timer.c b/sys/i4b/layer2/i4b_l2timer.c
index 22d3a9a..05ff31e 100644
--- a/sys/i4b/layer2/i4b_l2timer.c
+++ b/sys/i4b/layer2/i4b_l2timer.c
@@ -161,7 +161,7 @@ i4b_T202_stop(l2_softc_t *l2sc)
 /*---------------------------------------------------------------------------*
  *	Q.921 timer T203 timeout function
  *---------------------------------------------------------------------------*/
-#if I4B_T203_ACTIVE
+#if defined(I4B_T203_ACTIVE) && I4B_T203_ACTIVE
 static void
 i4b_T203_timeout(l2_softc_t *l2sc)
 {
@@ -176,7 +176,7 @@ i4b_T203_timeout(l2_softc_t *l2sc)
 void
 i4b_T203_start(l2_softc_t *l2sc)
 {
-#if I4B_T203_ACTIVE
+#if defined(I4B_T203_ACTIVE) && I4B_T203_ACTIVE
 	if (l2sc->T203 == TIMER_ACTIVE)
 		return;
 		
@@ -193,7 +193,7 @@ i4b_T203_start(l2_softc_t *l2sc)
 void
 i4b_T203_stop(l2_softc_t *l2sc)
 {
-#if I4B_T203_ACTIVE
+#if defined(I4B_T203_ACTIVE) && I4B_T203_ACTIVE
 	CRIT_VAR;
 	CRIT_BEG;
 	if(l2sc->T203 != TIMER_IDLE)
@@ -212,7 +212,7 @@ i4b_T203_stop(l2_softc_t *l2sc)
 void
 i4b_T203_restart(l2_softc_t *l2sc)
 {
-#if I4B_T203_ACTIVE
+#if defined(I4B_T203_ACTIVE) && I4B_T203_ACTIVE
 	CRIT_VAR;
 	CRIT_BEG;
 
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 16d0ade..4a53c70 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -441,7 +441,7 @@ i4bioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td
 					break;
 #endif
 
-#if NIBC > 0
+#if defined(NIBC) && NIBC > 0
 				case BDRV_IBC:
 					dlt = ibc_ret_linktab(mdrsp->driver_unit);
 					break;
diff --git a/sys/i4b/layer4/i4b_l4.c b/sys/i4b/layer4/i4b_l4.c
index 44a7d40..9cdd3e1 100644
--- a/sys/i4b/layer4/i4b_l4.c
+++ b/sys/i4b/layer4/i4b_l4.c
@@ -645,7 +645,7 @@ i4b_link_bchandrvr(call_desc_t *cd)
 			break;
 #endif
 
-#if NIBC > 0
+#if defined(NIBC) && NIBC > 0
 		case BDRV_IBC:
 			cd->dlt = ibc_ret_linktab(cd->driver_unit);
 			break;
@@ -699,7 +699,7 @@ i4b_link_bchandrvr(call_desc_t *cd)
 			break;
 #endif
 
-#if NIBC > 0
+#if defined(NIBC) && NIBC > 0
 		case BDRV_IBC:
 			ibc_set_linktab(cd->driver_unit, cd->ilt);
 			break;
-- 
cgit v1.1