summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2012-06-10 12:16:16 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2012-06-10 12:16:16 (GMT)
commit49b8e72012f8baa1b4d30f6b1d8f47fa88e7426f (patch)
tree17ed531aa17fdfb682f7785744f4db95489a38da
parent52de9c7141f3dc6dbb801a9d1d1429238917ee4a (diff)
downloadbusybox-49b8e72012f8baa1b4d30f6b1d8f47fa88e7426f.tar.gz
busybox-49b8e72012f8baa1b4d30f6b1d8f47fa88e7426f.tar.bz2
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>
-rw-r--r--networking/brctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/brctl.c b/networking/brctl.c
index 19f474f..7289e64 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);
}