For win64 it is cast unsigned long long.

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

diff --git a/src/win32/config.h b/src/win32/config.h
index 47d03af..85b3f6c 100644 (file)
--- a/src/win32/config.h
+++ b/src/win32/config.h
@@ -4,7 +4,8 @@
 
 /* config.h - simgrid config selection for windows platforms. */
 
-/* Copyright (c) 2003, 2004 Cherier Malek. All rights reserved.            */
+/* Copyright (c) 2006, 2007, 2008, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -18,8 +19,11 @@
 #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
@@ -34,31 +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
+#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)
@@ -66,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__ */