diff --git a/library/net_sockets.c b/library/net_sockets.c
index 10b5456be..6ce9eee7b 100644
--- a/library/net_sockets.c
+++ b/library/net_sockets.c
@@ -45,7 +45,7 @@
 #if (defined(_WIN32) || defined(_WIN32_WCE)) && !defined(EFIX64) && \
     !defined(EFI32)
 
-#define MBEDTLS_EINTR WSAEINTR
+#define IS_EINTR( ret ) ( ( ret ) == WSAEINTR )
 
 #ifdef _WIN32_WINNT
 #undef _WIN32_WINNT
@@ -84,7 +84,7 @@ static int wsa_init_done = 0;
 #include <netdb.h>
 #include <errno.h>
 
-#define MBEDTLS_EINTR EINTR
+#define IS_EINTR( ret ) ( ( ret ) == EINTR )
 
 #endif /* ( _WIN32 || _WIN32_WCE ) && !EFIX64 && !EFI32 */
 
@@ -479,7 +479,7 @@ int mbedtls_net_poll( mbedtls_net_context *ctx, uint32_t rw, uint32_t timeout )
         ret = select( fd + 1, &read_fds, &write_fds, NULL,
                       timeout == (uint32_t) -1 ? NULL : &tv );
     }
-    while( ret == MBEDTLS_EINTR );
+    while( IS_EINTR( ret ) );
 
     if( ret < 0 )
         return( MBEDTLS_ERR_NET_POLL_FAILED );