Make smx_file_t, surf_file_t and msg_file_t

[simgrid.git] / src / win32 / config.h

diff --git a/src/win32/config.h b/src/win32/config.h
index f80fd22..3d65bb3 100644 (file)
--- 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,49 +38,51 @@ 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
+#define EWOULDBLOCK WSAEWOULDBLOCK
 #endif
-
 #ifndef EINPROGRESS
-       #define EINPROGRESS WSAEINPROGRESS
+#define EINPROGRESS WSAEINPROGRESS
 #endif
-
 #ifndef ETIMEDOUT
-       #define ETIMEDOUT   WSAETIMEDOUT
+#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)
+#define sock_errstr(err)   xbt_wsa_err2string(err)
 
-const char *gras_wsa_err2string(int errcode);
+const char *xbt_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__ */