Define correctly variables for windows.

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

diff --git a/src/win32/config.h b/src/win32/config.h
index eddc478..fa25dbc 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. */
@@ -17,11 +18,19 @@
 
 #if defined(_XBT_BORLAND_COMPILER)
 # include <win32/compiler/borland.h>
+
+#elif defined(__GNUC__)
+  /* data comes from autoconf when using gnuc (cross-compiling?) */
+# include "gras_config.h"
+typedef unsigned int uint32_t;
+
+#elif defined(_XBT_VISUALC_COMPILER)
+# include <win32/compiler/visualc.h>
 # else
 # error "Unknown compiler - please report the problems to the main simgrid mailing list (http://gforge.inria.fr/mail/?group_id=12)"
 #endif
 
-
+typedef int socklen_t;
 #define tcp_read( s, buf, len )        recv( s, buf, len, 0 )
 #define tcp_write( s, buf, len )       send( s, buf, len, 0 )
 #define ioctl( s, c, a )               ioctlsocket( (s), (c), (a) )
@@ -34,17 +43,19 @@
        #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
@@ -72,6 +83,6 @@ const char *gras_wsa_err2string(int errcode);
 
 #define S_IWGRP 0
 
-       
 
-#endif /* #ifndef __XBT_WIN32_CONFIG_H__ */
\ No newline at end of file
+
+#endif /* #ifndef __XBT_WIN32_CONFIG_H__ */