tiny conflict resolution

[simgrid.git] / include / simgrid_config.h.in

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index a1b3414..be5c24d 100644 (file)
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -1,11 +1,12 @@
 /* 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-2012. 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 */
+#include "xbt/dynar.h"          /* sg_commandline */
 
 #ifndef SIMGRID_PUBLIC_CONFIG_H
 #define SIMGRID_PUBLIC_CONFIG_H
@@ -33,19 +34,8 @@ SG_BEGIN_DECL()
     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);
 
-/** Check that the link-time and compile-time versions of SimGrid do match.
-  * There is no need to call it yourself, it's done automatically during the SimGrid initialization */
-#define sg_check_version() {                      \
-  int ver_major,ver_minor,ver_patch;              \
-  sg_version(&ver_major,&ver_minor,&ver_patch);   \
-  if ((ver_major != SIMGRID_VERSION_MAJOR) ||     \
-      (ver_minor != SIMGRID_VERSION_MINOR) ||     \
-      (ver_patch != SIMGRID_VERSION_PATCH)) {     \
-    fprintf(stderr,"FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, and then linked against SimGrid %d.%d.%d. Please fix this.\n", \
-        SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH,ver_major,ver_minor,ver_patch);                          \
-  }                                               \
-} 
-  
+/** Contains all the parameters we got from the command line */
+XBT_PUBLIC_DATA(xbt_dynar_t) sg_cmdline;
 
 /* take care of DLL usage madness */
 
@@ -81,24 +71,11 @@ XBT_PUBLIC(void) sg_version(int *major,int *minor,int *patch);
 #cmakedefine HAVE_MMAP @HAVE_MMAP@
 
 /* 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 */
@@ -138,6 +115,9 @@ XBT_PUBLIC(char *) bvprintf(const char *fmt, va_list ap);
 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@