X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2274fba49b139b613bebd8f50ce80d67df2e93a8..1e830ec2832ab05f4bc81e681e7388b056e8ca12:/include/simgrid_config.h.in

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index d5e8cab7b6..6dbecddde5 100644
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -19,11 +19,16 @@
 	#endif
 #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 _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__@
+#ifdef _XBT_WIN32
+	#ifndef __GNUC__
+		#cmakedefine __GNUC__ @__GNUC__@
+	#endif
+#endif
 
 #ifndef SIMGRID_PUBLIC_CONFIG_H
 #define SIMGRID_PUBLIC_CONFIG_H
@@ -37,8 +42,8 @@ SG_BEGIN_DECL()
 #undef SIMGRID_NEED_ASPRINTF
 #undef SIMGRID_NEED_VASPRINTF
 @need_getline@
-@need_asprintf@
-@need_vasprintf@
+@simgrid_need_asprintf@
+@simgrid_need_vasprintf@
 
 /* Use that config to declare missing elements */
 #ifdef SIMGRID_NEED_GETLINE
@@ -51,7 +56,7 @@ XBT_PUBLIC(long) getline(char **lineptr, size_t * n, FILE * stream);
 #endif
 #include <stdio.h>
 #endif
-
+#include <stdarg.h>
 
 /* snprintf related functions */
 /** @addtogroup XBT_str
@@ -74,15 +79,27 @@ XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt,   /*args */
  * See asprintf()
  */
 #if defined(SIMGRID_NEED_VASPRINTF)||defined(DOXYGEN)
-#include <stdarg.h>
 XBT_PUBLIC(int) vasprintf(char **ptr, const char *fmt, va_list ap);
 #endif
 /** @brief print to allocated string
  *
- * Works just like asprintf(), but returns a pointer to the newly created string
+ * Works just like vasprintf(), but returns a pointer to the newly
+ * created string, or aborts on error.
+ */
+XBT_PUBLIC(char *) bvprintf(const char *fmt, va_list ap);
+/** @brief print to allocated string
+ *
+ * Works just like asprintf(), but returns a pointer to the newly
+ * created string, or aborts on error.
  */
 XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
 /** @} */
 
+/* Tracing SimGrid */
+#cmakedefine HAVE_TRACING @HAVE_TRACING@
+
+/* Tracking of latency bound */
+#cmakedefine HAVE_LATENCY_BOUND_TRACKING @HAVE_LATENCY_BOUND_TRACKING@
+
 SG_END_DECL()
 #endif /* SIMGRID_PUBLIC_CONFIG_H */