X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8dcdec139b0bf2540da12afeb39a6d60642cbbb0..60b5a5343a46b30521319379620c94d1314eb1bc:/src/win32/config.h diff --git a/src/win32/config.h b/src/win32/config.h index 6d12290aad..d63a083f88 100644 --- 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-2008, 2010, 2012-2014. 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. */ @@ -12,15 +13,46 @@ /* * config selection. */ -#include +#if defined(__GNUC__) /* either MinGW or cross-compiling */ + # include "internal_config.h" + #ifndef _XBT_WIN32 + typedef unsigned int uint32_t; + #endif +#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 _MSC_VER + #ifndef EWOULDBLOCK + #define EWOULDBLOCK WSAEWOULDBLOCK + #endif + + #ifndef EINPROGRESS + #define EINPROGRESS WSAEINPROGRESS + #endif + + #ifndef ETIMEDOUT + #define ETIMEDOUT WSAETIMEDOUT + #endif +#endif + +#ifdef S_IRGRP + #undef S_IRGRP +#endif +#define S_IRGRP 0 -#if defined(_XBT_BORLAND_COMPILER) -# include -# else -# error "Unknown compiler - please report the problems to the main simgrid mailing list (http://gforge.inria.fr/mail/?group_id=12)" +#ifdef S_IWGRP + #undef S_IWGRP #endif - +#define S_IWGRP 0 -#endif /* #ifndef __XBT_WIN32_CONFIG_H__ */ \ No newline at end of file +#endif /* #ifndef __XBT_WIN32_CONFIG_H__ */