src/internal.h: Hoist the qcontext definition to before typeinfo.

[adns.git] / src / poll.c

diff --git a/src/poll.c b/src/poll.c
index fba6de56646a80b9edd41476d165f1853d165c2d..25075ed8dbf061850801f346e220a83f7b4e8bf9 100644 (file)
--- a/src/poll.c
+++ b/src/poll.c
@@ -3,12 +3,11 @@
  * - wrappers for poll(2)
  */
 /*
- *  This file is
- *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
- *
- *  It is part of adns, which is
- *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ *  This file is part of adns, which is
+ *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1999-2000,2003,2006  Tony Finch
+ *    Copyright (C) 1991 Massachusetts Institute of Technology
+ *  (See the file INSTALL for full details.)
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -32,8 +31,8 @@
 
 #ifdef HAVE_POLL
 
-int adns_beforepoll(adns_state ads, struct pollfd *fds, int *nfds_io, int *timeout_io,
-                   const struct timeval *now) {
+int adns_beforepoll(adns_state ads, struct pollfd *fds, int *nfds_io,
+                   int *timeout_io, const struct timeval *now) {
   struct timeval tv_nowbuf, tv_tobuf, *tv_to;
   int space, found, timeout_ms, r;
   struct pollfd fds_tmp[MAX_POLLFDS];
@@ -106,7 +105,7 @@ int adns_wait_poll(adns_state ads,
 
   for (;;) {
     r= adns__internal_check(ads,query_io,answer_r,context_r);
-    if (r != EWOULDBLOCK) goto xit;
+    if (r != EAGAIN) goto xit;
     nfds= MAX_POLLFDS; to= -1;
     adns_beforepoll(ads,fds,&nfds,&to,0);
     r= poll(fds,nfds,to);