GNU C version 3.3.6 (Debian 1:3.3.6-15) (i486-linux-gnu)
says:
networking/brctl.c:39: error: duplicate `inline'
networking/brctl.c:52: error: duplicate `inline'
line:
static inline ALWAYS_INLINE void strtotimeval(struct timeval *tv,
is expanded to:
static __inline__ __attribute__ ((always_inline)) __inline__ void
strtotimeval(struct timeval *tv,
On the other hand,
GNU C version 4.2.3 (Debian 4.2.3-2) (i486-linux-gnu)
does not complain, while expanding to an identical line:
static __inline__ __attribute__ ((always_inline)) __inline__ void
strtotimeval(struct timeval *tv,
The attached patch removes the __inline__ duplication.
Cheers,
--
Cristian
Index: networking/brctl.c
===================================================================
--- networking/brctl.c (revision 21043)
+++ networking/brctl.c (working copy)
@@ -34,8 +34,7 @@
#if ENABLE_FEATURE_BRCTL_FANCY
#include <linux/if_bridge.h>
/* FIXME: These 4 funcs are not really clean and could be improved */
-static inline ALWAYS_INLINE void strtotimeval(struct timeval *tv,
- const char *time_str)
+static ALWAYS_INLINE void strtotimeval(struct timeval *tv, const char *time_str)
{
double secs;
#if BRCTL_USE_INTERNAL
@@ -48,7 +47,7 @@
tv->tv_usec = 1000000 * (secs - tv->tv_sec);
}
-static inline ALWAYS_INLINE unsigned long __tv_to_jiffies(const struct timeval *tv)
+static ALWAYS_INLINE unsigned long __tv_to_jiffies(const struct timeval *tv)
{
unsigned long long jif;
_______________________________________________
busybox mailing list
[email protected]
http://busybox.net/cgi-bin/mailman/listinfo/busybox
