cosmetics

[simgrid.git] / include / xbt / sysdep.h

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 2c7c194..e75b40f 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -20,14 +20,22 @@
 #include "xbt/asserts.h"
   
 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 */
-static inline char *xbt_strdup(const char *s) {
+#if defined(__GNUC__) || defined(DOXYGEN)
+/** @brief Like strdup, but xbt_die() on error */
+static XBT_INLINE char *xbt_strdup(const char *s) {
   char *res = NULL;
   if (s) {
     res=strdup(s);
@@ -36,9 +44,9 @@ 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){
+static XBT_INLINE void *xbt_malloc(int n){
   void *res=malloc(n);
   if (!res)
      xbt_die("Memory allocation failed");
@@ -47,7 +55,7 @@ static inline void *xbt_malloc(int n){
 
 /** @brief like malloc, but xbt_die() on error and memset data to 0
     @hideinitializer */
-static inline void *xbt_malloc0(int n) {
+static XBT_INLINE void *xbt_malloc0(int n) {
   void *res=calloc(n,1);
   if (!res)
      xbt_die("Memory callocation failed");
@@ -56,7 +64,7 @@ static inline void *xbt_malloc0(int n) {
   
 /** @brief like realloc, but xbt_die() on error 
     @hideinitializer */
-static inline void *xbt_realloc(void*p,int s){
+static XBT_INLINE void *xbt_realloc(void*p,int s){
   void *res=res;
   if (s) {
     if (p) {
@@ -95,8 +103,9 @@ 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);
   
 SG_END_DECL()