diff options
Diffstat (limited to 'src/testcurl/test_get_sendfile.c')
| -rw-r--r-- | src/testcurl/test_get_sendfile.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/testcurl/test_get_sendfile.c b/src/testcurl/test_get_sendfile.c index 36f29b27..8db2c3aa 100644 --- a/src/testcurl/test_get_sendfile.c +++ b/src/testcurl/test_get_sendfile.c @@ -276,7 +276,12 @@ testExternalGet () fd_set rs; fd_set ws; fd_set es; - MHD_socket max; + MHD_socket maxsock; +#ifdef MHD_WINSOCK_SOCKETS + int maxposixs; /* Max socket number unused on W32 */ +#else /* MHD_POSIX_SOCKETS */ +#define maxposixs maxsock +#endif /* MHD_POSIX_SOCKETS */ int running; struct CURLMsg *msg; time_t start; @@ -325,12 +330,13 @@ testExternalGet () start = time (NULL); while ((time (NULL) - start < 5) && (multi != NULL)) { - max = 0; + maxsock = MHD_INVALID_SOCKET; + maxposixs = -1; FD_ZERO (&rs); FD_ZERO (&ws); FD_ZERO (&es); curl_multi_perform (multi, &running); - mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); + mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs); if (mret != CURLM_OK) { curl_multi_remove_handle (multi, c); @@ -339,7 +345,7 @@ testExternalGet () MHD_stop_daemon (d); return 2048; } - if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) + if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock)) { curl_multi_remove_handle (multi, c); curl_multi_cleanup (multi); @@ -349,7 +355,7 @@ testExternalGet () } tv.tv_sec = 0; tv.tv_usec = 1000; - select (max + 1, &rs, &ws, &es, &tv); + select (maxposixs + 1, &rs, &ws, &es, &tv); curl_multi_perform (multi, &running); if (running == 0) { |