X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..5744268bf404292887f93d4521a94579c9aaea93:/include/xbt/sysdep.h

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index de2ef82ea3..33aefed2a4 100644
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -1,9 +1,9 @@
-/* $Id$ */
 /*  xbt/sysdep.h -- all system dependency                                   */
 /*  no system header should be loaded out of this file so that we have only */
 /*  one file to check when porting to another OS                            */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * 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. */
@@ -18,6 +18,8 @@
 #include "xbt/misc.h"
 #include "xbt/asserts.h"
 
+#include "simgrid_config.h"
+
 SG_BEGIN_DECL()
 
 /* They live in asserts.h, but need to be declared before this module.
@@ -48,7 +50,8 @@ XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
 
 #if defined(__GNUC__) || defined(DOXYGEN)
 /** @brief Like strdup, but xbt_die() on error */
-     static XBT_INLINE char *xbt_strdup(const char *s)
+static inline __attribute__ ((always_inline))
+char *xbt_strdup(const char *s)
 {
   char *res = NULL;
   if (s) {
@@ -59,11 +62,12 @@ XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
   return res;
 }
 
-extern void xbt_backtrace_display_current(void);
+XBT_PUBLIC(void) xbt_backtrace_display_current(void);
 
 /** @brief Like malloc, but xbt_die() on error
     @hideinitializer */
-static XBT_INLINE void *xbt_malloc(unsigned int n)
+static inline __attribute__ ((always_inline))
+void *xbt_malloc(size_t n)
 {
   void *res;
 /*  if (n==0) {
@@ -73,33 +77,38 @@ static XBT_INLINE void *xbt_malloc(unsigned int n)
 
   res = malloc(n);
   if (!res)
-    xbt_die(bprintf("Memory allocation of %d bytes failed", n));
+    xbt_die(bprintf("Memory allocation of %lu bytes failed",
+                    (unsigned long)n));
   return res;
 }
 
 /** @brief like malloc, but xbt_die() on error and memset data to 0
     @hideinitializer */
-static XBT_INLINE void *xbt_malloc0(unsigned int n)
+static inline __attribute__ ((always_inline))
+void *xbt_malloc0(size_t n)
 {
   void *res;
   //if (n==0) xbt_die("calloc(0) is not portable");
   res = calloc(n, 1);
   if (!res)
-    xbt_die(bprintf("Memory callocation of %d bytes failed", n));
+    xbt_die(bprintf("Memory callocation of %lu bytes failed",
+                    (unsigned long)n));
   return res;
 }
 
 /** @brief like realloc, but xbt_die() on error
     @hideinitializer */
-static XBT_INLINE void *xbt_realloc(void *p, unsigned int s)
+static inline __attribute__ ((always_inline))
+void *xbt_realloc(void *p, size_t s)
 {
-  void *res = res;
+  void *res = NULL;
   //if (s==0) xbt_die("realloc(0) is not portable");
   if (s) {
     if (p) {
       res = realloc(p, s);
       if (!res)
-        xbt_die(bprintf("memory (re)allocation of %d bytes failed", s));
+        xbt_die(bprintf("memory (re)allocation of %lu bytes failed",
+                        (unsigned long)s));
     } else {
       res = xbt_malloc(s);
     }
@@ -110,12 +119,12 @@ static XBT_INLINE void *xbt_realloc(void *p, unsigned int s)
   }
   return res;
 }
-#else /* non __GNUC__  */
+#else                           /* non __GNUC__  */
 #  define xbt_strdup(s)    strdup(s)
 #  define xbt_malloc(n)    malloc(n)
 #  define xbt_malloc0(n)   calloc(n,1)
 #  define xbt_realloc(p,s) realloc(p,s)
-#endif /* __GNUC__ ? */
+#endif                          /* __GNUC__ ? */
 
 /** @brief like free
     @hideinitializer */
@@ -138,4 +147,4 @@ XBT_PUBLIC(void) xbt_free_ref(void *d);
 
 
 SG_END_DECL()
-#endif /* _XBT_SYSDEP_H */
+#endif                          /* _XBT_SYSDEP_H */