From bbaf1ca20af395f7aff731b58e9d1d12d0083f91 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 13 Aug 2006 00:20:16 +0200 Subject: [GCC4] fix build error in drivers/usb/audio.c This patch fixes this error with gcc 4 : audio.c:466: error: static declaration of 'abs' follows non-static declaration make[2]: *** [audio.o] Error 1 make[2]: Leaving directory `/usr/src/git/linux-2.4/drivers/usb' make[1]: *** [_modsubdir_usb] Error 2 make[1]: Leaving directory `/usr/src/git/linux-2.4/drivers' make: *** [_mod_drivers] Error 2 --- drivers/usb/audio.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/usb/audio.c b/drivers/usb/audio.c index 732a7ba..18b5e76 100644 --- a/drivers/usb/audio.c +++ b/drivers/usb/audio.c @@ -217,9 +217,6 @@ #define SND_DEV_DSP16 5 #define dprintk(x) -#undef abs -extern int abs(int __x) __attribute__ ((__const__)); /* Shut up warning */ - /* --------------------------------------------------------------------- */ /* @@ -461,8 +458,8 @@ #define AFMT_ENDIAN(x) ((x)&AFMT_EN /* --------------------------------------------------------------------- */ /* prevent picking up a bogus abs macro */ -#undef abs -static inline int abs(int x) +#undef my_abs +static inline int my_abs(int x) { if (x < 0) return -x; @@ -1401,7 +1398,7 @@ static int usbout_sync_retire_desc(struc continue; } f = cp[0] | (cp[1] << 8) | (cp[2] << 16); - if (abs(f - u->freqn) > (u->freqn >> 3) || f > u->freqmax) { + if (my_abs(f - u->freqn) > (u->freqn >> 3) || f > u->freqmax) { printk(KERN_WARNING "usbout_sync_retire_desc: requested frequency %u (nominal %u) out of range!\n", f, u->freqn); continue; } -- 1.4.2