X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8be7ea3f9e71cd563e91b6aba63f5c70f043fbd5..60b5a5343a46b30521319379620c94d1314eb1bc:/src/win32/config.h diff --git a/src/win32/config.h b/src/win32/config.h index 36a84eed15..d63a083f88 100644 --- 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-2008, 2010, 2012-2013. 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,17 +13,23 @@ /* * config selection. */ -#if defined(__GNUC__) - /* data comes from autoconf when using gnuc (cross-compiling?) */ +#if defined(__GNUC__) /* either MinGW or cross-compiling */ # include "internal_config.h" #ifndef _XBT_WIN32 typedef unsigned int uint32_t; #endif -# else - # error "Unknown compiler - please report the problems to the main simgrid mailing list (http://gforge.inria.fr/mail/?group_id=12)" +#else + #ifdef _MSC_VER /* MSVC */ + + /* Manually define the HAVE_* corresponding to the MSVC development environment */ + #define HAVE_VA_COPY + + # else + # error "Unknown compiler - please report the problems to the main simgrid mailing list (http://gforge.inria.fr/mail/?group_id=12)" + #endif #endif -#ifndef _XBT_VISUALC_COMPILER +#ifndef _MSC_VER #ifndef EWOULDBLOCK #define EWOULDBLOCK WSAEWOULDBLOCK #endif