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

diff --git a/lib/dropin.c b/lib/dropin.c
index 4aed74e95125b6492f9ecc64e464d771f3fe9970..eb17acaad082ecb40d489bd5f7c0022cdadcd7d7 100644 (file)
--- a/lib/dropin.c
+++ b/lib/dropin.c
@@ -165,7 +165,7 @@ int gettimeofday(struct timeval *tv, void *tz) {
 #endif
 
 #ifndef HAVE_USLEEP
 #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;
        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 22fe36d394f683eb30b8c086c5dc543475f94750..dc7dbee22aabb1791530d35e6972e5642bb8c09d 100644 (file)
--- a/lib/dropin.h
+++ b/lib/dropin.h
@@ -42,7 +42,7 @@ extern int gettimeofday(struct timeval *, void *);
 #endif
 
 #ifndef HAVE_USLEEP
 #endif
 
 #ifndef HAVE_USLEEP

-extern int usleep(long);
+extern int usleep(long long);

 #endif
 
 #endif                                                 /* __DROPIN_H__ */
 #endif
 
 #endif                                                 /* __DROPIN_H__ */

diff --git a/src/net.c b/src/net.c
index b3f924ad661232312427abf929aadc6b4af1e361..8762db3841912c5395dfdbe68a8c1d9710cf1512 100644 (file)
--- 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);
 
                        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;
                                sleeptime *= 2;
                                if(sleeptime < 0)
                                        sleeptime = 3600;