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
[simix] Port UContext to C++
[simgrid.git]
/
include
/
xbt
/
misc.h
diff --git
a/include/xbt/misc.h
b/include/xbt/misc.h
index
a8d8c00
..
e1e454b
100644
(file)
--- a/
include/xbt/misc.h
+++ b/
include/xbt/misc.h
@@
-1,6
+1,6
@@
/* xbt.h - Public interface to the xbt (simgrid's toolbox) */
/* xbt.h - Public interface to the xbt (simgrid's toolbox) */
-/* Copyright (c) 2004-201
4
. The SimGrid Team.
+/* Copyright (c) 2004-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-9,12
+9,12
@@
#ifndef XBT_MISC_H
#define XBT_MISC_H
#ifndef XBT_MISC_H
#define XBT_MISC_H
-#include <stdarg.h>
-
#include "simgrid_config.h"
#include "base.h"
#include "dynar.h"
#include "simgrid_config.h"
#include "base.h"
#include "dynar.h"
+#include <stdarg.h>
+
SG_BEGIN_DECL()
/** Cache the size of a memory page for the current system. */
SG_BEGIN_DECL()
/** Cache the size of a memory page for the current system. */
@@
-29,6
+29,9
@@
XBT_PUBLIC(const char *) xbt_procname(void);
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);
+/** Helps ensuring that the header version (SIMGRID_VERSION_MAJOR and friends) and the dynamic library version do match. */
+XBT_PUBLIC(void) sg_version_check(int lib_version_major,int lib_version_minor,int lib_version_patch);
+
/** Contains all the parameters we got from the command line */
XBT_PUBLIC_DATA(xbt_dynar_t) sg_cmdline;
/** Contains all the parameters we got from the command line */
XBT_PUBLIC_DATA(xbt_dynar_t) sg_cmdline;
@@
-48,7
+51,7
@@
XBT_PUBLIC_DATA(xbt_dynar_t) sg_cmdline;
*/
#if defined(SIMGRID_NEED_ASPRINTF)||defined(DOXYGEN)
XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt, /*args */
*/
#if defined(SIMGRID_NEED_ASPRINTF)||defined(DOXYGEN)
XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt, /*args */
- ...)
_XBT_GNUC
_PRINTF(2, 3);
+ ...)
XBT_ATTRIB
_PRINTF(2, 3);
#endif
/** @brief print to allocated string (reimplemented when not provided by the system)
*
#endif
/** @brief print to allocated string (reimplemented when not provided by the system)
*
@@
-69,7
+72,7
@@
XBT_PUBLIC(char *) bvprintf(const char *fmt, va_list ap);
* Works just like asprintf(), but returns a pointer to the newly
* created string, or aborts on error.
*/
* 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);
+XBT_PUBLIC(char *) bprintf(const char *fmt, ...)
XBT_ATTRIB
_PRINTF(1, 2);
/** @} */
SG_END_DECL()
/** @} */
SG_END_DECL()