Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Protect EWOULDBLOCK, EINPROGRESS, ETIMEDOUT macro definitions since Visual C already...
authornavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Fri, 4 Jun 2010 16:04:32 +0000 (16:04 +0000)
committernavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Fri, 4 Jun 2010 16:04:32 +0000 (16:04 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7833 48e7efb5-ca39-0410-a469-dd3cf9ba447f

src/win32/config.h

index f80fd22..fa25dbc 100644 (file)
@@ -43,17 +43,19 @@ typedef int socklen_t;
        #define tcp_close( s )  closesocket( s )
 #endif
 
        #define tcp_close( s )  closesocket( s )
 #endif
 
-#ifndef EWOULDBLOCK
-       #define EWOULDBLOCK WSAEWOULDBLOCK
+#ifndef _XBT_VISUALC_COMPILER
+       #ifndef EWOULDBLOCK
+               #define EWOULDBLOCK WSAEWOULDBLOCK
+       #endif
+       #ifndef EINPROGRESS
+               #define EINPROGRESS WSAEINPROGRESS
+       #endif
+       #ifndef ETIMEDOUT
+               #define ETIMEDOUT   WSAETIMEDOUT
+       #endif
 #endif
 
 #endif
 
-#ifndef EINPROGRESS
-       #define EINPROGRESS WSAEINPROGRESS
-#endif
 
 
-#ifndef ETIMEDOUT
-       #define ETIMEDOUT   WSAETIMEDOUT
-#endif
 
 #ifdef sock_errno
        #undef  sock_errno
 
 #ifdef sock_errno
        #undef  sock_errno