From 218865bd467b14fc91ab551986ae9e22ff9613b8 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 13 Aug 2006 10:49:36 +0200 Subject: [GCC4] fix build error in drivers/cdrom/sbpcd.c This patch fixes these errors with gcc 4 : sbpcd.c: In function 'get_state_T': sbpcd.c:1216: error: invalid storage class for function 'cmd_out_T' sbpcd.c:1221: warning: implicit declaration of function 'cmd_out_T' sbpcd.c: At top level: sbpcd.c:1360: error: static declaration of 'cmd_out_T' follows non-static declaration sbpcd.c:1221: error: previous implicit declaration of 'cmd_out_T' was here sbpcd.c: In function 'cmd_out_T': sbpcd.c:1365: error: invalid storage class for function 'cc_DriveReset' sbpcd.c:1501: warning: implicit declaration of function 'cc_DriveReset' sbpcd.c: At top level: sbpcd.c:1996: error: static declaration of 'cc_DriveReset' follows non-static declaration sbpcd.c:1501: error: previous implicit declaration of 'cc_DriveReset' was here --- drivers/cdrom/sbpcd.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c index c477caa..180309f 100644 --- a/drivers/cdrom/sbpcd.c +++ b/drivers/cdrom/sbpcd.c @@ -525,6 +525,8 @@ static int sbp_data(struct request *req) static int cmd_out(void); static int DiskInfo(void); static int sbpcd_chk_disk_change(kdev_t); +static int cmd_out_T(void); +static int cc_DriveReset(void); /*==========================================================================*/ @@ -1213,8 +1215,6 @@ static int get_state_T(void) { int i; - static int cmd_out_T(void); - clr_cmdbuf(); D_S[d].n_bytes=1; drvcmd[0]=CMDT_STATUS; @@ -1362,7 +1362,6 @@ #undef CMDT_TRIES #define CMDT_TRIES 1000 #define TEST_FALSE_FF 1 - static int cc_DriveReset(void); int i, j, l=0, m, ntries; long flags; -- 1.4.2