-/* $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. */
#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.
#if defined(__GNUC__) || defined(DOXYGEN)
/** @brief Like strdup, but xbt_die() on error */
-static inline __attribute__((always_inline)) char *xbt_strdup(const char *s)
+static inline __attribute__ ((always_inline))
+char *xbt_strdup(const char *s)
{
char *res = NULL;
if (s) {
/** @brief Like malloc, but xbt_die() on error
@hideinitializer */
-static inline __attribute__((always_inline)) void *xbt_malloc(unsigned int n)
+static inline __attribute__ ((always_inline))
+void *xbt_malloc(size_t n)
{
void *res;
/* if (n==0) {
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 inline __attribute__((always_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 inline __attribute__((always_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);
}
}
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 */
SG_END_DECL()
-#endif /* _XBT_SYSDEP_H */
+#endif /* _XBT_SYSDEP_H */