From 2fdec3014e1f2d331abcaa5228b59928ae651f12 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 13 Aug 2006 10:44:04 +0200 Subject: [GCC4] fix build error in drivers/atm/iphase.c This patch fixes these errors with gcc 4 : iphase.c:89: error: static declaration of 'IADebugFlag' follows non-static declaration iphase.h:71: error: previous declaration of 'IADebugFlag' was here iphase.c: In function 'ia_que_tx': iphase.c:630: error: invalid storage class for function 'ia_pkt_tx' iphase.c:644: warning: implicit declaration of function 'ia_pkt_tx' iphase.c: At top level: iphase.c:2934: error: static declaration of 'ia_pkt_tx' follows non-static declaration iphase.c:644: error: previous implicit declaration of 'ia_pkt_tx' was here --- drivers/atm/iphase.c | 2 +- drivers/atm/iphase.h | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index d84d761..978fe10 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c @@ -82,6 +82,7 @@ static IADEV *ia_dev[8]; static struct atm_dev *_ia_dev[8]; static int iadev_count; static void ia_led_timer(unsigned long arg); +static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb); static struct timer_list ia_timer = { function: ia_led_timer }; struct atm_vcc *vcc_close_que[100]; static int IA_TX_BUF = DFL_TX_BUFFERS, IA_TX_BUF_SZ = DFL_TX_BUF_SZ; @@ -627,7 +628,6 @@ static int ia_que_tx (IADEV *iadev) { int num_desc; struct atm_vcc *vcc; struct ia_vcc *iavcc; - static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb); num_desc = ia_avail_descs(iadev); while (num_desc && (skb = skb_dequeue(&iadev->tx_backlog))) { if (!(vcc = ATM_SKB(skb)->vcc)) { diff --git a/drivers/atm/iphase.h b/drivers/atm/iphase.h index 24acc43..6676ac8 100644 --- a/drivers/atm/iphase.h +++ b/drivers/atm/iphase.h @@ -68,8 +68,6 @@ #define IF_IADBG_DESC 0x010000 #define IF_IADBG_SUNI_STAT 0x02000000 // suni statistics #define IF_IADBG_RESET 0x04000000 -extern unsigned int IADebugFlag; - #define IF_IADBG(f) if (IADebugFlag & (f)) #ifdef CONFIG_ATM_IA_DEBUG /* Debug build */ -- 1.4.2