X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de8cfa17c0e30bf9dccf0b0c9ecaff7858926f04..210da270d0339479db706757d8c836621bb138c9:/include/simgrid_config.h.in

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index 5b362cb535..0d0cd0db1a 100644
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -1,98 +1,46 @@
-/* simgrid_config.h - Results of the configure made visible to user code    */
+/* simgrid_config.h - Results of the configure made visible to user code.   */
 
-/* Copyright (c) 2009-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-2016. The 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. */
 
 #ifndef SIMGRID_PUBLIC_CONFIG_H
 #define SIMGRID_PUBLIC_CONFIG_H
+#include <xbt/base.h>
 
 /** Define the version numbers of the used header files. 
-    sg_version() can be used to retrieve the version of the dynamic library.
-    But actually, if these numbers don't match, SimGrid refuses to start (so you shouldn't have to care about sg_version() yourself) */
-
+  See sg_version_get() to retrieve the version of the dynamic library. */
 #define SIMGRID_VERSION_MAJOR @SIMGRID_VERSION_MAJOR@
 #define SIMGRID_VERSION_MINOR @SIMGRID_VERSION_MINOR@
 #define SIMGRID_VERSION_PATCH @SIMGRID_VERSION_PATCH@
+#define SIMGRID_GIT_VERSION   "@GIT_VERSION@"
+#define SIMGRID_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
 
-#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)*/
-
-#define MAKE_SIMGRID_VERSION(major, minor, patch)       \
-  (100UL * (100UL * (major) + (minor)) + (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
-	#ifndef DLL_EXPORT
-		#define DLL_EXPORT
-	#endif
-#else
-	#ifdef _XBT_DLL_STATIC
-		#ifndef DLL_STATIC
-			#define DLL_STATIC
-		#endif
-	#else
-		#ifndef DLL_EXPORT
-			#define DLL_IMPORT
-		#endif
-	#endif
-#endif
+SG_BEGIN_DECL()
+/** Retrieves the version numbers of the used dynamic library (so, DLL or dynlib), while
+    SIMGRID_VERSION_MAJOR and friends give the version numbers of the used header files */
+XBT_PUBLIC(void) sg_version_get(int *major,int *minor,int *patch);
 
-#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__@
-#ifdef _XBT_WIN32
-	#ifndef __GNUC__
-		#cmakedefine __GNUC__ @__GNUC__@
-	#endif
-#endif
+/** Display the version information and some additional blurb. */
+XBT_PUBLIC(void) sg_version(void);
+SG_END_DECL()
 
-#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@
+/* Version as a single integer. v3.4 is 30400, v3.16.2 is 31602, v42 will be 420000, and so on. */
+#define SIMGRID_VERSION (100UL * (100UL * (@SIMGRID_VERSION_MAJOR@) + (@SIMGRID_VERSION_MINOR@)) + (@SIMGRID_VERSION_PATCH@))
 
-/* Get the config */
-#undef SIMGRID_NEED_ASPRINTF
-#undef SIMGRID_NEED_VASPRINTF
-@simgrid_need_asprintf@
-@simgrid_need_vasprintf@
-
-/* Whether mallocators were enabled in ccmake or not. */
-#define MALLOCATOR_COMPILED_IN @MALLOCATOR_IS_WANTED@
-
-/* Define if xbt contexts are based on our threads implementation or not */
-#cmakedefine CONTEXT_THREADS @CONTEXT_THREADS@
-
-/* 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@
+#define SIMGRID_VERSION_STRING "@SIMGRID_VERSION_STRING@"
 
-/* If Model-Checking support was requested */
-#cmakedefine HAVE_MC @HAVE_MC@
+/* Was Jedule compiled in?  */
+#cmakedefine01 HAVE_JEDULE
+/* Was the Lua support compiled in? */
+#cmakedefine01 HAVE_LUA
+/* Were mallocators (object pools) compiled in? */
+#cmakedefine01 HAVE_MALLOCATOR
+/* Was the model-checking compiled in? */
+#cmakedefine01 HAVE_MC
+/* Was the NS3 support compiled in? */
+#cmakedefine01 HAVE_NS3
 
 #endif /* SIMGRID_PUBLIC_CONFIG_H */