X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13fcf118a0aa6eb2c46a8a1a29b8aa586302374f..62e3231a0c0ab2726ef027a3e70f3e3dfe1e81db:/include/xbt/sysdep.h

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index e6bec9d90b..5b56a1bba3 100644
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -19,14 +19,22 @@
 #include "xbt/misc.h"
 #include "xbt/asserts.h"
   
-BEGIN_DECL()
+SG_BEGIN_DECL()
+/* They live in asserts.h, but need to be declared before this module.
+   double declaration to cut dependency cycle */
+
+void xbt_abort(void) _XBT_GNUC_NORETURN;
+void xbt_die(const char *msg) _XBT_GNUC_NORETURN;
+
 
 /** @addtogroup XBT_syscall
+ *  @brief Malloc and associated functions, killing the program on error (with \ref XBT_ex)
+ *
  *  @{
  */
 
-#ifdef __GNUC__
-/** @brief like strdup, but xbt_die() on error */
+#if defined(__GNUC__) || defined(DOXYGEN)
+/** @brief Like strdup, but xbt_die() on error */
 static inline char *xbt_strdup(const char *s) {
   char *res = NULL;
   if (s) {
@@ -36,7 +44,7 @@ static inline char *xbt_strdup(const char *s) {
   } 
   return res;
 }
-/** @brief like malloc, but xbt_die() on error 
+/** @brief Like malloc, but xbt_die() on error 
     @hideinitializer */
 static inline void *xbt_malloc(int n){
   void *res=malloc(n);
@@ -95,9 +103,10 @@ static inline void *xbt_realloc(void*p,int s){
 /** @} */  
 
 /* FIXME: better place? */
-int vasprintf  (char **ptr, const char *fmt, va_list ap);
-char *bprintf(const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
+int   asprintf  (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3);
+int   vasprintf (char **ptr, const char *fmt, va_list ap);
+char *bprintf   (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
   
-END_DECL()
+SG_END_DECL()
 
 #endif /* _XBT_SYSDEP_H */