diff options
| author | Nick Mathewson <nickm@torproject.org> | 2003-08-14 17:51:36 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2003-08-14 17:51:36 +0000 |
| commit | 1777487f4ea898f6919334f8a8cbdba7724f2abd (patch) | |
| tree | caf5727bf91d810255b323aeea8a86a1515960ee /src/common/util.h | |
| parent | adbc0577728dbf09d5c35efb2c36c0cc11fc5f59 (diff) | |
| download | tor-1777487f4ea898f6919334f8a8cbdba7724f2abd.tar tor-1777487f4ea898f6919334f8a8cbdba7724f2abd.tar.gz | |
Tor now builds on win32.
svn:r400
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/common/util.h b/src/common/util.h index 0590f8ed7..614a5388a 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) |