[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Fix win32 compilation: backport candidate
Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv13599/src/or
Modified Files:
main.c
Log Message:
Fix win32 compilation: backport candidate
Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -d -r1.507 -r1.508
--- main.c 6 Jun 2005 20:02:33 -0000 1.507
+++ main.c 6 Jun 2005 20:06:10 -0000 1.508
@@ -943,7 +943,7 @@
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 @@
#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