aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2012-06-10 14:16:16 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2012-06-10 14:16:16 +0200
commit49b8e72012f8baa1b4d30f6b1d8f47fa88e7426f (patch)
tree17ed531aa17fdfb682f7785744f4db95489a38da
parent52de9c7141f3dc6dbb801a9d1d1429238917ee4a (diff)
downloadbusybox-w32-49b8e72012f8baa1b4d30f6b1d8f47fa88e7426f.tar.gz
busybox-w32-49b8e72012f8baa1b4d30f6b1d8f47fa88e7426f.tar.bz2
busybox-w32-49b8e72012f8baa1b4d30f6b1d8f47fa88e7426f.zip
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 19f474fce..7289e641f 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -67,7 +67,7 @@
67# include <linux/if_bridge.h> 67# include <linux/if_bridge.h>
68 68
69/* FIXME: These 4 funcs are not really clean and could be improved */ 69/* FIXME: These 4 funcs are not really clean and could be improved */
70static ALWAYS_INLINE void strtotimeval(struct timeval *tv, 70static ALWAYS_INLINE void bb_strtotimeval(struct timeval *tv,
71 const char *time_str) 71 const char *time_str)
72{ 72{
73 double secs; 73 double secs;
@@ -104,7 +104,7 @@ static void jiffies_to_tv(struct timeval *tv, unsigned long jiffies)
104static unsigned long str_to_jiffies(const char *time_str) 104static unsigned long str_to_jiffies(const char *time_str)
105{ 105{
106 struct timeval tv; 106 struct timeval tv;
107 strtotimeval(&tv, time_str); 107 bb_strtotimeval(&tv, time_str);
108 return tv_to_jiffies(&tv); 108 return tv_to_jiffies(&tv);
109} 109}
110 110