X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd043f62d4d7bf22adb68d5193ec1bb2aaae3c7b..445590fd865f35e74be34955931c97b8956f6d7f:/include/simgrid_config.h.in

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index 1735095cf9..e07f48a826 100644
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -1,21 +1,46 @@
-/* $Id$ */
-
 /* 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 MAKE_SIMGRID_VERSION(major, minor, patch)       \
+  (100UL * (100UL * (major) + (minor)) + (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, \
+                                             SIMGRID_VERSION_PATCH)
+
+/* 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
-		#define DLL_STATIC
+		#ifndef DLL_STATIC
+			#define DLL_STATIC
+		#endif
 	#else
-		#define DLL_IMPORT
+		#ifndef DLL_EXPORT
+			#define DLL_IMPORT
+		#endif
 	#endif
 #endif
 
@@ -30,9 +55,6 @@
 	#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@
@@ -56,7 +78,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
@@ -79,18 +101,39 @@ 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@
+
+/* 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 */