From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 4 Jun 2010 16:04:32 +0000 (+0000)
Subject: Protect EWOULDBLOCK, EINPROGRESS, ETIMEDOUT macro definitions since Visual C already... 
X-Git-Tag: v3_5~975
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/883d93c5bc5287fe287a6a57478fc3d435fce8d3

Protect EWOULDBLOCK, EINPROGRESS, ETIMEDOUT macro definitions since Visual C already defines them.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7833 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/win32/config.h b/src/win32/config.h
index f80fd224f1..fa25dbc6dd 100644
--- a/src/win32/config.h
+++ b/src/win32/config.h
@@ -43,17 +43,19 @@ typedef int socklen_t;
 	#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
 
-#ifndef EINPROGRESS
-	#define EINPROGRESS WSAEINPROGRESS
-#endif
 
-#ifndef ETIMEDOUT
-	#define ETIMEDOUT   WSAETIMEDOUT
-#endif
 
 #ifdef sock_errno
 	#undef  sock_errno