diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index e30f605adb..7255fecead 100644
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -1570,7 +1570,10 @@ static CURLcode cf_socket_send(struct Curl_cfilter *cf, struct Curl_easy *data,
          due to its inability to send off data without blocking. We therefore
          treat both error codes the same here */
       (SOCKEWOULDBLOCK == sockerr) ||
-      (EAGAIN == sockerr) || (SOCKEINTR == sockerr) ||
+#if EAGAIN != SOCKEWOULDBLOCK
+      (EAGAIN == sockerr) ||
+#endif
+      (SOCKEINTR == sockerr) ||
       (SOCKEINPROGRESS == sockerr)
 #endif
       ) {
@@ -1636,7 +1639,10 @@ static CURLcode cf_socket_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
          due to its inability to send off data without blocking. We therefore
          treat both error codes the same here */
       (SOCKEWOULDBLOCK == sockerr) ||
-      (EAGAIN == sockerr) || (SOCKEINTR == sockerr)
+#if EAGAIN != SOCKEWOULDBLOCK
+      (EAGAIN == sockerr) ||
+#endif
+      (SOCKEINTR == sockerr)
 #endif
       ) {
       /* EWOULDBLOCK */
diff --git a/lib/socketpair.c b/lib/socketpair.c
index 76b959dd4a..3611458dbc 100644
--- a/lib/socketpair.c
+++ b/lib/socketpair.c
@@ -326,7 +326,11 @@ int Curl_wakeup_signal(curl_socket_t socks[2])
 #else
       if(SOCKEINTR == err)
         continue;
-      if((err == SOCKEWOULDBLOCK) || (err == EAGAIN))
+      if((err == SOCKEWOULDBLOCK)
+#if EAGAIN != SOCKEWOULDBLOCK
+         || (err == EAGAIN)
+#endif
+        )
         err = 0; /* wakeup is already ongoing */
 #endif
     }