X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/693f30b46244c152cd79cdf3ad35d4a79b866c9c..46e229fc1c826e4c0561cc2386a7c307e2b0b9e9:/include/simgrid_config.h.in

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index a12421b3f4..354fceccc7 100644
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -1,16 +1,13 @@
 /* simgrid_config.h - Results of the configure made visible to user code    */
 
-/* Copyright (c) 2009, 2010, 2011. Da SimGrid team. All rights reserved.    */
+/* Copyright (c) 2009-2014. 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. */
 
-#include "xbt/misc.h"           /* XBT_PUBLIC */
-
 #ifndef SIMGRID_PUBLIC_CONFIG_H
 #define SIMGRID_PUBLIC_CONFIG_H
-SG_BEGIN_DECL()
-
 
 /** Define the version numbers of the used header files. 
     sg_version() can be used to retrieve the version of the dynamic library.
@@ -20,6 +17,10 @@ SG_BEGIN_DECL()
 #define SIMGRID_VERSION_MINOR @SIMGRID_VERSION_MINOR@
 #define SIMGRID_VERSION_PATCH @SIMGRID_VERSION_PATCH@
 
+#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)*/
 
@@ -29,10 +30,6 @@ SG_BEGIN_DECL()
                                              SIMGRID_VERSION_MINOR, \
                                              SIMGRID_VERSION_PATCH)
 
-/** 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(int *major,int *minor,int *patch);
-
 /* take care of DLL usage madness */
 
 #ifdef _XBT_DLL_EXPORT
@@ -55,81 +52,35 @@ XBT_PUBLIC(void) sg_version(int *major,int *minor,int *patch);
 #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
 
+#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
+#endif
 
-/* Define to 1 if you have the `mmap' function. */
-#cmakedefine HAVE_MMAP @HAVE_MMAP@
+/* Define to 1 if mmalloc is compiled in. */
+#cmakedefine HAVE_MMALLOC @HAVE_MMALLOC@
 
 /* Get the config */
-#undef SIMGRID_NEED_GETLINE
 #undef SIMGRID_NEED_ASPRINTF
 #undef SIMGRID_NEED_VASPRINTF
-@need_getline@
 @simgrid_need_asprintf@
 @simgrid_need_vasprintf@
 
-/* Use that config to declare missing elements */
-#ifdef SIMGRID_NEED_GETLINE
-#include <stdlib.h> /* size_t */
-#include <stdio.h>  /* FILE*  */
-XBT_PUBLIC(long) getline(char **lineptr, size_t * n, FILE * stream);
-#else
-#ifndef _GNU_SOURCE
-	#define _GNU_SOURCE
-#endif
-#include <stdio.h>
-#endif
-#include <stdarg.h>
-
-/* snprintf related functions */
-/** @addtogroup XBT_str
-  * @{ */
-/** @brief print to allocated string (reimplemented when not provided by the system)
- *
- * The functions asprintf() and vasprintf() are analogues of
- * sprintf() and vsprintf(), except that they allocate a string large
- * enough to hold the output including the terminating null byte, and
- * return a pointer to it via the first parameter.  This pointer
- * should be passed to free(3) to release the allocated storage when
- * it is no longer needed.
- */
-#if defined(SIMGRID_NEED_ASPRINTF)||defined(DOXYGEN)
-XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt,   /*args */
-                         ...) _XBT_GNUC_PRINTF(2, 3);
-#endif
-/** @brief print to allocated string (reimplemented when not provided by the system)
- *
- * See asprintf()
- */
-#if defined(SIMGRID_NEED_VASPRINTF)||defined(DOXYGEN)
-XBT_PUBLIC(int) vasprintf(char **ptr, const char *fmt, va_list ap);
-#endif
-/** @brief print to allocated 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);
-/** @} */
+/* 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@
 
-/* Tracing SimGrid */
-#cmakedefine HAVE_TRACING @HAVE_TRACING@
-
 /* Jedule output  */
 #cmakedefine HAVE_JEDULE @HAVE_JEDULE@
 
@@ -142,5 +93,4 @@ XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
 /* If Model-Checking support was requested */
 #cmakedefine HAVE_MC @HAVE_MC@
 
-SG_END_DECL()
 #endif /* SIMGRID_PUBLIC_CONFIG_H */