X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/883d93c5bc5287fe287a6a57478fc3d435fce8d3..f07101941f4397554a6cee4fbaf3286137865064:/src/win32/config.h

diff --git a/src/win32/config.h b/src/win32/config.h
index fa25dbc6dd..85b3f6c6c4 100644
--- a/src/win32/config.h
+++ b/src/win32/config.h
@@ -18,12 +18,12 @@
 
 #if defined(_XBT_BORLAND_COMPILER)
 # include <win32/compiler/borland.h>
-
 #elif defined(__GNUC__)
-  /* data comes from autoconf when using gnuc (cross-compiling?) */
+        /* data comes from autoconf when using gnuc (cross-compiling?) */
 # include "gras_config.h"
+#ifndef _XBT_WIN32
 typedef unsigned int uint32_t;
-
+#endif
 #elif defined(_XBT_VISUALC_COMPILER)
 # include <win32/compiler/visualc.h>
 # else
@@ -38,33 +38,33 @@ typedef int socklen_t;
 #define AC_SOCKET_INVALID        	((unsigned int) ~0)
 
 #ifdef SD_BOTH
-	#define tcp_close(s)	(shutdown( s, SD_BOTH ), closesocket(s))
+#define tcp_close(s)	(shutdown( s, SD_BOTH ), closesocket(s))
 #else
-	#define tcp_close( s )	closesocket( s )
+#define tcp_close( s )	closesocket( s )
 #endif
 
 #ifndef _XBT_VISUALC_COMPILER
-	#ifndef EWOULDBLOCK
-		#define EWOULDBLOCK WSAEWOULDBLOCK
-	#endif
-	#ifndef EINPROGRESS
-		#define EINPROGRESS WSAEINPROGRESS
-	#endif
-	#ifndef ETIMEDOUT
-		#define ETIMEDOUT   WSAETIMEDOUT
-	#endif
+#ifndef EWOULDBLOCK
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#endif
+#ifndef EINPROGRESS
+#define EINPROGRESS WSAEINPROGRESS
+#endif
+#ifndef ETIMEDOUT
+#define ETIMEDOUT   WSAETIMEDOUT
+#endif
 #endif
 
 
 
 #ifdef sock_errno
-	#undef  sock_errno
+#undef  sock_errno
 #endif
 
 #define sock_errno         WSAGetLastError()
 
 #ifdef sock_errstr
-	#undef  sock_errstr
+#undef  sock_errstr
 #endif
 
 #define sock_errstr(err)   gras_wsa_err2string(err)
@@ -72,17 +72,17 @@ typedef int socklen_t;
 const char *gras_wsa_err2string(int errcode);
 
 #ifdef S_IRGRP
-	#undef S_IRGRP
+#undef S_IRGRP
 #endif
 
 #define S_IRGRP 0
 
 #ifdef S_IWGRP
-	#undef S_IWGRP
+#undef S_IWGRP
 #endif
 
 #define S_IWGRP 0
 
 
 
-#endif /* #ifndef __XBT_WIN32_CONFIG_H__ */
+#endif                          /* #ifndef __XBT_WIN32_CONFIG_H__ */