From: navarrop Date: Fri, 18 Jun 2010 16:01:26 +0000 (+0000) Subject: Set variables for windows. X-Git-Tag: v3_5~902 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1ce4ab769824a1be26f14d1a06b617e37a89ba66 Set variables for windows. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7907 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in index 8985e0f641..a1baeeef6b 100644 --- a/include/simgrid_config.h.in +++ b/include/simgrid_config.h.in @@ -15,6 +15,12 @@ #define DLL_IMPORT #endif +#cmakedefine _XBT_WIN32 @_XBT_WIN32@ //this variable is set if it is a windows platform +#cmakedefine _WIN32 @_WIN32@ //this variable is set if it is a 32 bits windows platform +#cmakedefine _WIN64 @_WIN64@ //this variable is set if it is a 64 bits windows platform +#cmakedefine __VISUALC__ @__VISUALC__@ +#cmakedefine __BORLANDC__ @__BORLANDC__@ + #ifndef SIMGRID_PUBLIC_CONFIG_H #define SIMGRID_PUBLIC_CONFIG_H diff --git a/include/xbt/graphxml_parse.h b/include/xbt/graphxml_parse.h index f70dbc4889..84d3df835c 100644 --- a/include/xbt/graphxml_parse.h +++ b/include/xbt/graphxml_parse.h @@ -12,6 +12,7 @@ #include /* to have FILE */ #include "xbt/misc.h" #include "xbt/graphxml.h" +#include "simgrid_config.h" /* Entry-point of the graphxml parser. */ extern int_f_void_t xbt_graph_parse; diff --git a/src/surf/random_mgr.c b/src/surf/random_mgr.c index ebc698d71d..4588aa0ef6 100644 --- a/src/surf/random_mgr.c +++ b/src/surf/random_mgr.c @@ -6,6 +6,7 @@ #include "surf/random_mgr.h" #include "xbt/sysdep.h" +#include "simgrid_config.h" /*_XBT_WIN32*/ #ifdef _XBT_WIN32 diff --git a/src/xbt/setset.c b/src/xbt/setset.c index 34581828bb..16986fe2bb 100644 --- a/src/xbt/setset.c +++ b/src/xbt/setset.c @@ -3,6 +3,7 @@ #include #include "setset_private.h" #include "xbt/sysdep.h" +#include "simgrid_config.h" /*_XBT_WIN32*/ /*The function ffs doesn't exist for windows*/ #ifdef _XBT_WIN32