From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 10 Jun 2012 12:16:16 +0000 (+0200)
Subject: brctl: fix build failure by s/strtotimeval/bb_strtotimeval/ (android has strtotimeval)
X-Git-Tag: 1_21_0~153
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=49b8e72012f8baa1b4d30f6b1d8f47fa88e7426f;p=oweals%2Fbusybox.git

brctl: fix build failure by s/strtotimeval/bb_strtotimeval/ (android has strtotimeval)

Signed-off-by: Tias Guns <tias@ulyssis.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/brctl.c b/networking/brctl.c
index 19f474fce..7289e641f 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -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);
 }