A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MSVC] use our extended xbt_malloc, but don't choke on 'strdup' that should read...
[simgrid.git]
/
include
/
simgrid_config.h.in
diff --git
a/include/simgrid_config.h.in
b/include/simgrid_config.h.in
index
6a93f00
..
5b362cb
100644
(file)
--- a/
include/simgrid_config.h.in
+++ b/
include/simgrid_config.h.in
@@
-19,6
+19,8
@@
#define SIMGRID_VERSION_STRING "@SIMGRID_VERSION_STRING@"
#define SIMGRID_VERSION_STRING "@SIMGRID_VERSION_STRING@"
+#define SIMGRID_VERSION_BANNER "@SIMGRID_VERSION_BANNER@"
+
/* Version X.Y.Z will get version number XYZ: all digits concatenated without dots
* (with Y and Z must be on two positions)*/
/* Version X.Y.Z will get version number XYZ: all digits concatenated without dots
* (with Y and Z must be on two positions)*/
@@
-50,13
+52,21
@@
#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 _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__@
#ifdef _XBT_WIN32
#ifndef __GNUC__
#cmakedefine __GNUC__ @__GNUC__@
#endif
#endif
#ifdef _XBT_WIN32
#ifndef __GNUC__
#cmakedefine __GNUC__ @__GNUC__@
#endif
#endif
+#ifdef _MSC_VER /* MSVC has no ssize_t, and I fail to use the SSIZE_T declared in BaseTsd.h */
+ #if defined(_WIN64)
+ typedef __int64 ssize_t;
+ #else
+ typedef long ssize_t;
+ #endif
+ #define snprintf _snprintf
+ #define strdup _strdup
+#endif
/* Define to 1 if mmalloc is compiled in. */
#cmakedefine HAVE_MMALLOC @HAVE_MMALLOC@
/* Define to 1 if mmalloc is compiled in. */
#cmakedefine HAVE_MMALLOC @HAVE_MMALLOC@