[MSVC] VA_COPY is defined

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

diff --git a/src/win32/config.h b/src/win32/config.h
index 85b3f6c..d63a083 100644 (file)
--- a/src/win32/config.h
+++ b/src/win32/config.h
@@ -4,7 +4,7 @@
 
 /* config.h - simgrid config selection for windows platforms. */
 
-/* Copyright (c) 2006, 2007, 2008, 2010. The SimGrid Team.
+/* Copyright (c) 2006-2008, 2010, 2012-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -13,76 +13,46 @@
 /* 
  * config selection. 
 */
-#include <win32/compiler/select_compiler_features.h>
-
-
-#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"
-#ifndef _XBT_WIN32
-typedef unsigned int uint32_t;
-#endif
-#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) )
-#define ioctl_t                                                u_long
-#define AC_SOCKET_INVALID              ((unsigned int) ~0)
-
-#ifdef SD_BOTH
-#define tcp_close(s)   (shutdown( s, SD_BOTH ), closesocket(s))
+#if defined(__GNUC__) /* either MinGW or cross-compiling */
+  # include "internal_config.h"
+  #ifndef _XBT_WIN32
+    typedef unsigned int uint32_t;
+  #endif
 #else
-#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
-#endif
+  #ifdef _MSC_VER /* MSVC */
 
+    /* Manually define the HAVE_* corresponding to the MSVC development environment */
+    #define HAVE_VA_COPY
 
-
-#ifdef sock_errno
-#undef  sock_errno
+  # else
+    # error "Unknown compiler - please report the problems to the main simgrid mailing list (http://gforge.inria.fr/mail/?group_id=12)"
+  #endif
 #endif
 
-#define sock_errno         WSAGetLastError()
+#ifndef _MSC_VER
+  #ifndef EWOULDBLOCK
+  #define EWOULDBLOCK WSAEWOULDBLOCK
+  #endif
 
-#ifdef sock_errstr
-#undef  sock_errstr
-#endif
+  #ifndef EINPROGRESS
+  #define EINPROGRESS WSAEINPROGRESS
+  #endif
 
-#define sock_errstr(err)   gras_wsa_err2string(err)
-
-const char *gras_wsa_err2string(int errcode);
+  #ifndef ETIMEDOUT
+  #define ETIMEDOUT   WSAETIMEDOUT
+  #endif
+#endif
 
 #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__ */