Revert "Update to 7.40.1"

[platform/upstream/curl.git] / lib / select.c

diff --git a/lib/select.c b/lib/select.c
index 1c6481c..da3082d 100644 (file)
--- a/lib/select.c
+++ b/lib/select.c
@@ -39,10 +39,6 @@
 #include <dos.h>  /* delay() */
 #endif
 
-#ifdef __VXWORKS__
-#include <strings.h>  /* bzero() in FD_SET */
-#endif
-
 #include <curl/curl.h>
 
 #include "urldata.h"
@@ -112,10 +108,8 @@ int Curl_wait_ms(int timeout_ms)
     if(error && error_not_EINTR)
       break;
     pending_ms = timeout_ms - elapsed_ms;
-    if(pending_ms <= 0) {
-      r = 0;  /* Simulate a "call timed out" case */
+    if(pending_ms <= 0)
       break;
-    }
   } while(r == -1);
 #endif /* USE_WINSOCK */
   if(r)
@@ -438,10 +432,8 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms)
       break;
     if(timeout_ms > 0) {
       pending_ms = timeout_ms - elapsed_ms;
-      if(pending_ms <= 0) {
-        r = 0;  /* Simulate a "call timed out" case */
+      if(pending_ms <= 0)
         break;
-      }
     }
   } while(r == -1);
 
@@ -525,10 +517,8 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms)
       break;
     if(timeout_ms > 0) {
       pending_ms = timeout_ms - elapsed_ms;
-      if(pending_ms <= 0) {
-        r = 0;  /* Simulate a "call timed out" case */
+      if(pending_ms <= 0)
         break;
-      }
     }
   } while(r == -1);