X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ee6ffc12bf5523e4d2d2193138c791d991ec0ae4..ab1a94e98438ed2d29533aca9e613d667237c3d0:/include/xbt/sysdep.h diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h index 0d09d8a338..6ae59ffaab 100644 --- a/include/xbt/sysdep.h +++ b/include/xbt/sysdep.h @@ -17,12 +17,12 @@ #include "simgrid_config.h" -SG_BEGIN_DECL() - #include #include #include /* va_list */ +SG_BEGIN_DECL() + /* They live in asserts.h, but need to be declared before this module. double declaration to cut dependency cycle */ /** @@ -37,11 +37,9 @@ XBT_PUBLIC(void) XBT_ATTRIB_NORETURN xbt_abort(void); * @brief Kill the program with an error message * \param ... a format string and its arguments * - * Things are so messed up that the only thing to do now, is to stop the - * program. + * Things are so messed up that the only thing to do now, is to stop the program. * - * The message is handled by a CRITICAL logging request, and may consist of a - * format string with arguments. + * The message is handled by a CRITICAL logging request, and may consist of a format string with arguments. */ #define xbt_die(...) \ do { \ @@ -56,25 +54,12 @@ XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)"); XBT_LOG_EXTERNAL_CATEGORY(xbt); #endif -/* these ones live in str.h, but redeclare them here so that we do - not need to load the whole str.h and its heavy dependencies */ -#ifndef __USE_GNU /* do not redeclare existing headers */ -XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt, /*args */ - ...) XBT_ATTRIB_PRINTF(2, 3); -XBT_PUBLIC(int) vasprintf(char **ptr, const char *fmt, va_list ap); -#endif -XBT_PUBLIC(char *) bprintf(const char *fmt, ...) XBT_ATTRIB_PRINTF(1, 2); - /** @addtogroup XBT_syscall * @brief Malloc and associated functions, killing the program on error (with \ref XBT_ex) * * @{ */ -#if defined(_MSC_VER) && !defined(strdup) -# define strdup _strdup /* POSIX name is not ANSI complient blabla */ -#endif - /** @brief Like strdup, but xbt_die() on error */ static XBT_ALWAYS_INLINE char *xbt_strdup(const char *s) { char *res = NULL;