j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Guus Sliepen 2011-07-16 22:38:22 +02:00
parent 8efc8dc961
commit 574b380dfc
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dropin.c
View file

@ -165,7 +165,7 @@ int gettimeofday(struct timeval *tv, void *tz) {
#endif #endif
#ifndef HAVE_USLEEP #ifndef HAVE_USLEEP
int usleep(long usec) { int usleep(long long usec) {
struct timeval tv = {usec / 1000000, (usec / 1000) % 1000}; struct timeval tv = {usec / 1000000, (usec / 1000) % 1000};
select(0, NULL, NULL, NULL, &tv); select(0, NULL, NULL, NULL, &tv);
return 0; return 0;

4
src/dropin.h
View file

@ -41,4 +41,8 @@ extern int vasprintf(char **, const char *, va_list ap);
extern int gettimeofday(struct timeval *, void *); extern int gettimeofday(struct timeval *, void *);
#endif #endif
#ifndef HAVE_USLEEP
extern void usleep(long long usec);
#endif
#endif /* __DROPIN_H__ */ #endif /* __DROPIN_H__ */

2
src/net.c
View file

@ -193,7 +193,7 @@ static void timeout_handler(int fd, short events, void *event) {
if(contradicting_del_edge > 100 && contradicting_add_edge > 100) { if(contradicting_del_edge > 100 && contradicting_add_edge > 100) {
logger(LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime); logger(LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime);
sleep(sleeptime); usleep(sleeptime * 1000000LL);
sleeptime *= 2; sleeptime *= 2;
if(sleeptime < 0) if(sleeptime < 0)
sleeptime = 3600; sleeptime = 3600;