nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix win32 compilation: backport candidate

Browse Source 
svn:r4320
This commit is contained in:
Nick Mathewson 2005-06-06 20:06:10 +00:00
parent fc40f974c2
commit e1c8aa8035
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/main.c
View File

@ -943,7 +943,7 @@ static int do_main_loop(void) {
if (loop_result < 0) { if (loop_result < 0) {
int e = errno; int e = errno;
/* let the program survive things like ^z */ /* let the program survive things like ^z */
if (e != EINTR && e != EINPROGRESS) { if (e != EINTR && !ERRNO_IS_EINPROGRESS(e)) {
#ifdef HAVE_EVENT_GET_METHOD #ifdef HAVE_EVENT_GET_METHOD
log_fn(LOG_ERR,"libevent poll with %s failed: %s [%d]", log_fn(LOG_ERR,"libevent poll with %s failed: %s [%d]",
event_get_method(), tor_socket_strerror(e), e); event_get_method(), tor_socket_strerror(e), e);
@ -953,7 +953,7 @@ static int do_main_loop(void) {
#endif #endif
return -1; return -1;
} else { } else {
if (e == EINPROGRESS) if (ERRNO_IS_EINPROGRESS(e))
log_fn(LOG_WARN,"libevent poll returned EINPROGRESS? Please report."); log_fn(LOG_WARN,"libevent poll returned EINPROGRESS? Please report.");
log_fn(LOG_DEBUG,"event poll interrupted."); log_fn(LOG_DEBUG,"event poll interrupted.");
/* You can't trust the results of this poll(). Go back to the /* You can't trust the results of this poll(). Go back to the