aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-06-06 20:06:10 +0000
committerNick Mathewson <nickm@torproject.org>2005-06-06 20:06:10 +0000
commite1c8aa80358495d60f3326c84d40d00870c4a231 (patch)
tree39e852a042d6dce54b667525ca645b8ab39aac9e
parentfc40f974c2987e42a6a814fd2eaf0e002e020c18 (diff)
downloadtor-e1c8aa80358495d60f3326c84d40d00870c4a231.tar
tor-e1c8aa80358495d60f3326c84d40d00870c4a231.tar.gz
Fix win32 compilation: backport candidate
svn:r4320
-rw-r--r--src/or/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c
index f23cfa4f8..973b29eee 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -943,7 +943,7 @@ static int do_main_loop(void) {
if (loop_result < 0) {
int e = errno;
/* let the program survive things like ^z */
- if (e != EINTR && e != EINPROGRESS) {
+ if (e != EINTR && !ERRNO_IS_EINPROGRESS(e)) {
#ifdef HAVE_EVENT_GET_METHOD
log_fn(LOG_ERR,"libevent poll with %s failed: %s [%d]",
event_get_method(), tor_socket_strerror(e), e);
@@ -953,7 +953,7 @@ static int do_main_loop(void) {
#endif
return -1;
} else {
- if (e == EINPROGRESS)
+ if (ERRNO_IS_EINPROGRESS(e))
log_fn(LOG_WARN,"libevent poll returned EINPROGRESS? Please report.");
log_fn(LOG_DEBUG,"event poll interrupted.");
/* You can't trust the results of this poll(). Go back to the