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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
[simgrid.git]
/
include
/
simgrid_config.h.in
diff --git
a/include/simgrid_config.h.in
b/include/simgrid_config.h.in
index
8006704
..
e07f48a
100644
(file)
--- a/
include/simgrid_config.h.in
+++ b/
include/simgrid_config.h.in
@@
-1,5
+1,3
@@
-/* $Id$ */
-
/* simgrid_config.h - Results of the configure made visible to user code */
/* Copyright (c) 2009, 2010, 2011. Da SimGrid team. All rights reserved. */
/* simgrid_config.h - Results of the configure made visible to user code */
/* Copyright (c) 2009, 2010, 2011. Da SimGrid team. All rights reserved. */
@@
-20,9
+18,9
@@
SG_BEGIN_DECL()
#define MAKE_SIMGRID_VERSION(major, minor, patch) \
(100UL * (100UL * (major) + (minor)) + (patch))
#define MAKE_SIMGRID_VERSION(major, minor, patch) \
(100UL * (100UL * (major) + (minor)) + (patch))
-#
cmake
define SIMGRID_VERSION_MAJOR @SIMGRID_VERSION_MAJOR@
-#
cmake
define SIMGRID_VERSION_MINOR @SIMGRID_VERSION_MINOR@
-#
cmake
define SIMGRID_VERSION_PATCH @SIMGRID_VERSION_PATCH@
+#define SIMGRID_VERSION_MAJOR @SIMGRID_VERSION_MAJOR@
+#define SIMGRID_VERSION_MINOR @SIMGRID_VERSION_MINOR@
+#define SIMGRID_VERSION_PATCH @SIMGRID_VERSION_PATCH@
#define SIMGRID_VERSION MAKE_SIMGRID_VERSION(SIMGRID_VERSION_MAJOR, \
SIMGRID_VERSION_MINOR, \
#define SIMGRID_VERSION MAKE_SIMGRID_VERSION(SIMGRID_VERSION_MAJOR, \
SIMGRID_VERSION_MINOR, \
@@
-31,12
+29,18
@@
SG_BEGIN_DECL()
/* take care of DLL usage madness */
#ifdef _XBT_DLL_EXPORT
/* take care of DLL usage madness */
#ifdef _XBT_DLL_EXPORT
- #define DLL_EXPORT
+ #ifndef DLL_EXPORT
+ #define DLL_EXPORT
+ #endif
#else
#ifdef _XBT_DLL_STATIC
#else
#ifdef _XBT_DLL_STATIC
- #define DLL_STATIC
+ #ifndef DLL_STATIC
+ #define DLL_STATIC
+ #endif
#else
#else
- #define DLL_IMPORT
+ #ifndef DLL_EXPORT
+ #define DLL_IMPORT
+ #endif
#endif
#endif
#endif
#endif
@@
-125,5
+129,11
@@
XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
/* Tracking of latency bound */
#cmakedefine HAVE_LATENCY_BOUND_TRACKING @HAVE_LATENCY_BOUND_TRACKING@
/* Tracking of latency bound */
#cmakedefine HAVE_LATENCY_BOUND_TRACKING @HAVE_LATENCY_BOUND_TRACKING@
+/* If __thread is available */
+#cmakedefine HAVE_THREAD_LOCAL_STORAGE @HAVE_THREAD_LOCAL_STORAGE@
+
+/* If Model-Checking support was requested */
+#cmakedefine HAVE_MC @HAVE_MC@
+
SG_END_DECL()
#endif /* SIMGRID_PUBLIC_CONFIG_H */
SG_END_DECL()
#endif /* SIMGRID_PUBLIC_CONFIG_H */