From e1c8aa80358495d60f3326c84d40d00870c4a231 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 6 Jun 2005 20:06:10 +0000 Subject: Fix win32 compilation: backport candidate svn:r4320 --- src/or/main.c | 4 ++-- 1 file 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 -- cgit v1.2.3