cosmetics

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

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 62bd71a..333d722 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -4,22 +4,17 @@
 /*  no system header should be loaded out of this file so that we have only */
 /*  one file to check when porting to another OS                            */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2004 the OURAGAN project.                                  */
+/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
 
 /* This program is free software; you can redistribute it and/or modify it
-   under the terms of the license (GNU LGPL) which comes with this package. */
-
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #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
@@ -34,7 +29,7 @@ BEGIN_DECL
                            :(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))
@@ -63,7 +58,7 @@ BEGIN_DECL
 
 #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__)
 
@@ -74,8 +69,7 @@ BEGIN_DECL
 # define _XBT_INLINE 
 #endif
 
-
-void xbt_abort(void) _XBT_GNUC_NORETURN;
+END_DECL
    
 #include "xbt/error.h" /* needed for xbt_die */