brctl: fix build failure by s/strtotimeval/bb_strtotimeval/ (android has strtotimeval)
authorDenys Vlasenko <vda.linux@googlemail.com>
Sun, 10 Jun 2012 12:16:16 +0000 (14:16 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Sun, 10 Jun 2012 12:16:16 +0000 (14:16 +0200)
Signed-off-by: Tias Guns <tias@ulyssis.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
networking/brctl.c

index 19f474fce34d2a164ab9191db32be52d0c6bfc71..7289e641f5f28159e82fe2e145cc4605b1e68c52 100644 (file)
@@ -67,7 +67,7 @@
 # include <linux/if_bridge.h>
 
 /* FIXME: These 4 funcs are not really clean and could be improved */
-static ALWAYS_INLINE void strtotimeval(struct timeval *tv,
+static ALWAYS_INLINE void bb_strtotimeval(struct timeval *tv,
                const char *time_str)
 {
        double secs;
@@ -104,7 +104,7 @@ static void jiffies_to_tv(struct timeval *tv, unsigned long jiffies)
 static unsigned long str_to_jiffies(const char *time_str)
 {
        struct timeval tv;
-       strtotimeval(&tv, time_str);
+       bb_strtotimeval(&tv, time_str);
        return tv_to_jiffies(&tv);
 }