[GNUnet-SVN] [libmicrohttpd] branch master updated: Fixed non-portable changes in 91548850d961783a8f5b288c69ce83ecb89d3ddc Fixed waiting for empty fd_sets in test_empty_response.c and test_https_get_select.c

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

The following commit(s) were added to refs/heads/master by this push:
     new 1c9fd1b9 Fixed non-portable changes in 
91548850d961783a8f5b288c69ce83ecb89d3ddc Fixed waiting for empty fd_sets in 
test_empty_response.c and test_https_get_select.c
1c9fd1b9 is described below

commit 1c9fd1b90f875fbbf6d3f6f2c1a69fa7ce029210
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Sun Mar 12 22:37:29 2017 +0300

    Fixed non-portable changes in 91548850d961783a8f5b288c69ce83ecb89d3ddc
    Fixed waiting for empty fd_sets in test_empty_response.c and 
test_https_get_select.c
---
 src/testcurl/https/test_empty_response.c   | 11 ++++++++---
 src/testcurl/https/test_https_get_select.c | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/testcurl/https/test_empty_response.c 
b/src/testcurl/https/test_empty_response.c
index 5fd17bda..57e2d676 100644
--- a/src/testcurl/https/test_empty_response.c
+++ b/src/testcurl/https/test_empty_response.c
@@ -149,10 +149,15 @@ testInternalSelectGet ()
         }
       tv.tv_sec = 0;
       tv.tv_usec = 1000;
-      if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
+      if (-1 != maxposixs)
         {
-          if (EINTR != errno)
-            abort ();
+          if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
+            {
+#ifdef MHD_POSIX_SOCKETS
+              if (EINTR != errno)
+#endif /* MHD_POSIX_SOCKETS */
+                abort ();
+            }
         }
       curl_multi_perform (multi, &running);
       if (running == 0)
diff --git a/src/testcurl/https/test_https_get_select.c 
b/src/testcurl/https/test_https_get_select.c
index 024c52a4..a9ae7f62 100644
--- a/src/testcurl/https/test_https_get_select.c
+++ b/src/testcurl/https/test_https_get_select.c
@@ -175,10 +175,15 @@ testExternalGet (int flags)
         }
       tv.tv_sec = 0;
       tv.tv_usec = 1000;
-      if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
+      if (-1 != maxposixs)
         {
-          if (EINTR != errno)
-            abort ();
+          if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
+            {
+#ifdef MHD_POSIX_SOCKETS
+              if (EINTR != errno)
+#endif /* MHD_POSIX_SOCKETS */
+                abort ();
+            }
         }
       curl_multi_perform (multi, &running);
       if (running == 0)

-- 
To stop receiving notification emails like this one, please contact
address@hidden