From: Guus Sliepen <guus@tinc-vpn.org>
Date: Wed, 12 Jan 2011 19:57:14 +0000 (+0100)
Subject: Proper check and dropin replacement for usleep().
X-Git-Tag: release-1.0.14~14
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=b3731c04097e66a6b8908bb893c5da831d89c04d;p=tinc

Proper check and dropin replacement for usleep().
---

diff --git a/configure.in b/configure.in
index 8e1ae87e..078a7f1d 100644
--- a/configure.in
+++ b/configure.in
@@ -128,7 +128,7 @@ dnl Checks for library functions.
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv vsyslog writev],
+AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv usleep vsyslog writev],
   [], [], [#include "have.h"]
 )
 AC_FUNC_MALLOC
diff --git a/lib/dropin.c b/lib/dropin.c
index 52fb5b86..1bad05cd 100644
--- a/lib/dropin.c
+++ b/lib/dropin.c
@@ -164,9 +164,10 @@ int gettimeofday(struct timeval *tv, void *tz) {
 }
 #endif
 
-#ifdef HAVE_MINGW
+#ifndef HAVE_USLEEP
 int usleep(long usec) {
-	Sleep(usec / 1000);
+	struct timeval tv = {usec / 1000000, (usec / 1000) % 1000};
+	select(0, NULL, NULL, NULL, &tv);
 	return 0;
 }
 #endif
diff --git a/lib/dropin.h b/lib/dropin.h
index d5cf6d2c..a4d92480 100644
--- a/lib/dropin.h
+++ b/lib/dropin.h
@@ -41,7 +41,7 @@ extern int vasprintf(char **, const char *, va_list ap);
 extern int gettimeofday(struct timeval *, void *);
 #endif
 
-#ifdef HAVE_MINGW
+#ifndef HAVE_USLEEP
 extern int usleep(long);
 #endif