From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 23 Jul 2011 12:11:44 +0000 (+0200)
Subject: Use usleep() instead of sleep(), MinGW complained.
X-Git-Tag: release-1.0.16~1
X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=e16ead8dd9d4600664058069f0695832dfe068b2

Use usleep() instead of sleep(), MinGW complained.
---

diff --git a/lib/dropin.c b/lib/dropin.c
index 4aed74e9..eb17acaa 100644
--- a/lib/dropin.c
+++ b/lib/dropin.c
@@ -165,7 +165,7 @@ int gettimeofday(struct timeval *tv, void *tz) {
 #endif
 
 #ifndef HAVE_USLEEP
-int usleep(long usec) {
+int usleep(long long usec) {
 	struct timeval tv = {usec / 1000000, (usec / 1000) % 1000};
 	select(0, NULL, NULL, NULL, &tv);
 	return 0;
diff --git a/lib/dropin.h b/lib/dropin.h
index 22fe36d3..dc7dbee2 100644
--- a/lib/dropin.h
+++ b/lib/dropin.h
@@ -42,7 +42,7 @@ extern int gettimeofday(struct timeval *, void *);
 #endif
 
 #ifndef HAVE_USLEEP
-extern int usleep(long);
+extern int usleep(long long);
 #endif
 
 #endif							/* __DROPIN_H__ */
diff --git a/src/net.c b/src/net.c
index b3f924ad..8762db38 100644
--- a/src/net.c
+++ b/src/net.c
@@ -472,7 +472,7 @@ int main_loop(void) {
 
 			if(contradicting_del_edge > 100 && contradicting_add_edge > 100) {
 				logger(LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime);
-				sleep(sleeptime);
+				usleep(sleeptime * 1000000LL);
 				sleeptime *= 2;
 				if(sleeptime < 0)
 					sleeptime = 3600;