-#define gras_new(type, count) ((type*)gras_malloc (sizeof (type) * (count)))
-#define gras_new0(type, count) ((type*)gras_malloc0 (sizeof (type) * (count)))
-
-/* Attributes are only in recent versions of GCC */
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-# define _GRAS_GNUC_PRINTF( format_idx, arg_idx ) \
- __attribute__((__format__ (__printf__, format_idx, arg_idx)))
-# define _GRAS_GNUC_SCANF( format_idx, arg_idx ) \
- __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
-# define _GRAS_GNUC_FORMAT( arg_idx ) \
- __attribute__((__format_arg__ (arg_idx)))
-# define _GRAS_GNUC_NORETURN __attribute__((__noreturn__))
-
-#else /* !__GNUC__ */
-# define _GRAS_GNUC_PRINTF( format_idx, arg_idx )
-# define _GRAS_GNUC_SCANF( format_idx, arg_idx )
-# define _GRAS_GNUC_FORMAT( arg_idx )
-# define _GRAS_GNUC_NORETURN
-
-#endif /* !__GNUC__ */
-
-/* inline and __FUNCTION__ are only in GCC when -ansi is of */
-
-#if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
-
-# define _GRAS_GNUC_FUNCTION __FUNCTION__
-# define _GRAS_INLINE inline
-#else
-# define _GRAS_GNUC_FUNCTION "function"
-# define _GRAS_INLINE
-#endif
-
-
-void gras_abort(void) _GRAS_GNUC_NORETURN;
-
-/* FIXME: This is a very good candidate to rewrite (along with a proper string stuff)
- but I'm too lazy right now, so copy the definition */
-long int strtol(const char *nptr, char **endptr, int base);
-double strtod(const char *nptr, char **endptr);
-int atoi(const char *nptr);
-
-END_DECL
+/** @brief like calloc, but xbt_die() on error and don't memset to 0
+ @hideinitializer */
+#define xbt_new(type, count) ((type*)xbt_malloc (sizeof (type) * (count)))
+/** @brief like calloc, but xbt_die() on error
+ @hideinitializer */
+#define xbt_new0(type, count) ((type*)xbt_malloc0 (sizeof (type) * (count)))
+
+/** @} */
+
+/* FIXME: better place? */
+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()