A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In XBT_LOG_NEW_SUBCATEGORY_helper, protect function declaration with SG_{BEGIN,END...
[simgrid.git]
/
include
/
simgrid_config.h.in
diff --git
a/include/simgrid_config.h.in
b/include/simgrid_config.h.in
index
1c5edc8
..
789464f
100644
(file)
--- a/
include/simgrid_config.h.in
+++ b/
include/simgrid_config.h.in
@@
-1,11
+1,13
@@
/* 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, 2010, 2011. Da SimGrid team. All rights reserved. */
+/* Copyright (c) 2009-2013. 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 */
/* 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
#ifndef SIMGRID_PUBLIC_CONFIG_H
#define SIMGRID_PUBLIC_CONFIG_H
@@
-20,6
+22,8
@@
SG_BEGIN_DECL()
#define SIMGRID_VERSION_MINOR @SIMGRID_VERSION_MINOR@
#define SIMGRID_VERSION_PATCH @SIMGRID_VERSION_PATCH@
#define SIMGRID_VERSION_MINOR @SIMGRID_VERSION_MINOR@
#define SIMGRID_VERSION_PATCH @SIMGRID_VERSION_PATCH@
+#define SIMGRID_VERSION_STRING "@SIMGRID_VERSION_STRING@"
+
/* Version X.Y.Z will get version number XYZ: all digits concatenated without dots
* (with Y and Z must be on two positions)*/
/* Version X.Y.Z will get version number XYZ: all digits concatenated without dots
* (with Y and Z must be on two positions)*/
@@
-33,6
+37,9
@@
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);
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);
+/** Contains all the parameters we got from the command line */
+XBT_PUBLIC_DATA(xbt_dynar_t) sg_cmdline;
+
/* take care of DLL usage madness */
#ifdef _XBT_DLL_EXPORT
/* take care of DLL usage madness */
#ifdef _XBT_DLL_EXPORT
@@
-67,21
+74,11
@@
XBT_PUBLIC(void) sg_version(int *major,int *minor,int *patch);
#cmakedefine HAVE_MMAP @HAVE_MMAP@
/* Get the config */
#cmakedefine HAVE_MMAP @HAVE_MMAP@
/* Get the config */
-#undef SIMGRID_NEED_GETLINE
#undef SIMGRID_NEED_ASPRINTF
#undef SIMGRID_NEED_VASPRINTF
#undef SIMGRID_NEED_ASPRINTF
#undef SIMGRID_NEED_VASPRINTF
-@need_getline@
@simgrid_need_asprintf@
@simgrid_need_vasprintf@
@simgrid_need_asprintf@
@simgrid_need_vasprintf@
-#include <stdio.h> /* FILE, getline if it exists */
-
-/* Use that config to declare missing elements */
-#ifdef SIMGRID_NEED_GETLINE
-#include <stdlib.h> /* size_t */
-XBT_PUBLIC(long) getline(char **lineptr, size_t * n, FILE * stream);
-#endif
-
#include <stdarg.h>
/* snprintf related functions */
#include <stdarg.h>
/* snprintf related functions */
@@
-121,8
+118,8
@@
XBT_PUBLIC(char *) bvprintf(const char *fmt, va_list ap);
XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
/** @} */
XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
/** @} */
-/* Whether mallocators
should be enabled
or not. */
-#define MALLOCATOR_
IS_WANTED
@MALLOCATOR_IS_WANTED@
+/* 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@
/* Define if xbt contexts are based on our threads implementation or not */
#cmakedefine CONTEXT_THREADS @CONTEXT_THREADS@