[PATCH 6/6] android: fix brctl, avoid bionics strtotimeval (in <time.h>)

Tias Guns tias at ulyssis.org
Sun Jun 3 14:43:08 UTC 2012


patch from 'duplicate-strtotimeval' by Dan Drown
http://dan.drown.org/android/src/busybox/

Signed-off-by: Tias Guns <tias at ulyssis.org>
---
 networking/brctl.c |    4 ++--
 1 file 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);
 }
 
-- 
1.7.10



More information about the busybox mailing list