commit ea7dbbe0de008c1844f8f48fde08542e6a222fcc
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Mar 15 23:25:21 2018 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Mon Mar 19 17:10:31 2018 +0100
tree b46a1e4f8fd3e38892c60253652c9f10892beebf
parent c9f4d6d44899a26f001c28b93e86cf7d6452e693

Replace MBEDTLS_EINTR by IS_EINTR

check-names.sh reserves the prefix MBEDTLS_ for macros defined in
config.h so this name (or check-names.sh) had to change.

This is also more flexible because it allows for platforms that don't have
an EINTR equivalent or have multiple such values.

library/net_sockets.c

diff --git a/library/net_sockets.c b/library/net_sockets.c
index 10b5456..6ce9eee 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 @@
 #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 @@
         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 );