diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/fakepoll.c | 2 | ||||
| -rw-r--r-- | src/common/util.c | 3 | ||||
| -rw-r--r-- | src/common/util.h | 11 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/common/fakepoll.c b/src/common/fakepoll.c index 17bd18d401..27804ba0e0 100644 --- a/src/common/fakepoll.c +++ b/src/common/fakepoll.c @@ -66,7 +66,7 @@ poll(struct pollfd *ufds, unsigned int nfds, int timeout) } #ifdef MS_WINDOWS if (!any_fds_set) { - usleep(timeout); + Sleep(timeout); return 0; } #endif diff --git a/src/common/util.c b/src/common/util.c index dea4b33719..3a80b94da7 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -116,6 +116,7 @@ int spawn_func(int (*func)(void *), void *data) /* Child */ func(data); assert(0); /* Should never reach here. */ + return 0; /* suppress "control-reaches-end-of-non-void" warning. */ } else { /* Parent */ return 0; @@ -236,7 +237,7 @@ tor_socketpair(int family, int type, int protocol, int fd[2]) #ifdef MS_WINDOWS int correct_socket_errno(int s) { - int r, optval, optvallen=sizeof(optval); + int optval, optvallen=sizeof(optval); assert(errno == WSAEWOULDBLOCK); if (getsockopt(s, SOL_SOCKET, SO_ERROR, (void*)&optval, &optvallen)) return errno; diff --git a/src/common/util.h b/src/common/util.h index 0590f8ed7a..614a5388a6 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -19,6 +19,7 @@ #elif defined(_MSC_VER) #include <winsock.h> #endif +#include <errno.h> #ifndef HAVE_GETTIMEOFDAY #ifdef HAVE_FTIME #define USING_FAKE_TIMEVAL @@ -65,13 +66,9 @@ int tor_socketpair(int family, int type, int protocol, int fd[2]); * errnos which they use as the fancy strikes them. */ #ifdef MS_WINDOWS -#define ERRNO_EAGAIN(e) ((e) == EAGAIN || \ - (e) == WSAEWOULDBLOCK || \ - (e) == EWOULDBLOCK) -#define ERRNO_EINPROGRESS(e) ((e) == EINPROGRESS || \ - (e) == WSAEINPROGRESS) -#define ERRNO_CONN_EINPROGRESS(e) ((e) == EINPROGRESS || \ - (e) == WSAEINPROGRESS || (e) == WSAEINVAL) +#define ERRNO_EAGAIN(e) ((e) == EAGAIN || (e) == WSAEWOULDBLOCK) +#define ERRNO_EINPROGRESS(e) ((e) == WSAEINPROGRESS) +#define ERRNO_CONN_EINPROGRESS(e) ((e) == WSAEINPROGRESS || (e) == WSAEINVAL) int correct_socket_errno(int s); #else #define ERRNO_EAGAIN(e) ((e) == EAGAIN) |