#ifndef _XBT_SYSDEP_H
#define _XBT_SYSDEP_H
-#include <string.h> /* Included directly for speed */
-
-#include <time.h> /* FIXME: remove */
-#include <unistd.h> /* FIXME: remove */
+#include <string.h>
#include <stdlib.h>
-
+
#include "xbt/misc.h"
BEGIN_DECL
#if 0
:(NULL))
#define xbt_malloc(n) (malloc(n) ?: (xbt_die("memory allocation error"),NULL))
#define xbt_malloc0(n) (calloc( (n),1 ) ?: (xbt_die("memory allocation error"),NULL))
-#define xbt_realloc(p,s) (s? (p? (realloc(p,s)?:xbt_die("memory allocation error"),NULL) \
+#define xbt_realloc(p,s) (s? (p? (realloc(p,s)?:(xbt_die("memory allocation error"),NULL)) \
: xbt_malloc(s)) \
: (p? (free(p),NULL) \
: NULL))
#endif /* !__GNUC__ */
-/* inline and __FUNCTION__ are only in GCC when -ansi is of */
+/* inline and __FUNCTION__ are only in GCC when -ansi is off */
#if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
# define _XBT_INLINE
#endif
-
-void xbt_abort(void) _XBT_GNUC_NORETURN;
-
END_DECL
#include "xbt/error.h" /* needed for xbt_die */