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

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index d5e8cab7b6..74c1495de9 100644
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -2,13 +2,25 @@
 
 /* simgrid_config.h - Results of the configure made visible to user code    */
 
-/* Copyright (c) 2009, Da SimGrid team. All rights reserved.                */
+/* Copyright (c) 2009, 2010, 2011. Da 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. */
 
 #include "xbt/misc.h"           /* XBT_PUBLIC */
 
+#ifndef SIMGRID_PUBLIC_CONFIG_H
+#define SIMGRID_PUBLIC_CONFIG_H
+SG_BEGIN_DECL()
+
+
+/* Version X.Y.Z will get version number XYZ: all digits concatenated without dots
+ * (with Y and Z must be on two positions)*/
+
+#define SIMGRID_VERSION 30599 /* 3.5.99, aka 3.6 svn */
+
+/* take care of DLL usage madness */
+
 #ifdef _XBT_DLL_EXPORT
 	#define DLL_EXPORT
 #else
@@ -19,15 +31,17 @@
 	#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
-SG_BEGIN_DECL()
 
 /* Define to 1 if you have the `mmap' function. */
 #cmakedefine HAVE_MMAP @HAVE_MMAP@
@@ -37,8 +51,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 +65,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 +88,33 @@ 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);
 /** @} */
 
+/* Define if xbt contexts are based on our threads implementation or not */
+#cmakedefine CONTEXT_THREADS @CONTEXT_THREADS@
+
+/* Tracing SimGrid */
+#cmakedefine HAVE_TRACING @HAVE_TRACING@
+
+/* Jedule output  */
+#cmakedefine HAVE_JEDULE @HAVE_JEDULE@
+
+/* Tracking of latency bound */
+#cmakedefine HAVE_LATENCY_BOUND_TRACKING @HAVE_LATENCY_BOUND_TRACKING@
+
 SG_END_DECL()
 #endif /* SIMGRID_PUBLIC_CONFIG_H */