X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/37151c0d4c6efccef4ac99502864f1a7d8fc830b..1512ab28169826581aaa6755fbc04eb265e5657f:/include/xbt/sysdep.h diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h index 4bc927c29d..4537717fb5 100644 --- a/include/xbt/sysdep.h +++ b/include/xbt/sysdep.h @@ -2,7 +2,7 @@ /* 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, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2004-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -11,16 +11,16 @@ #ifndef _XBT_SYSDEP_H #define _XBT_SYSDEP_H -#include -#include -#include /* va_list */ - #include "xbt/log.h" #include "xbt/misc.h" #include "xbt/asserts.h" #include "simgrid_config.h" +#include +#include +#include /* va_list */ + SG_BEGIN_DECL() /* They live in asserts.h, but need to be declared before this module. @@ -31,17 +31,7 @@ SG_BEGIN_DECL() * @{ */ /** @brief Kill the program in silence */ -#ifdef COVERAGE -/* Call __gcov_flush on abort when compiling with coverage options. */ -#define xbt_abort() \ - do { \ - extern void __gcov_flush(void); \ - __gcov_flush(); \ - abort(); \ - } while (0) -#else -#define xbt_abort() abort() -#endif +XBT_PUBLIC(void) xbt_abort(void) _XBT_GNUC_NORETURN; /** * @brief Kill the program with an error message @@ -151,7 +141,7 @@ void *xbt_realloc(void *p, size_t s) /** @brief like free @hideinitializer */ -#define xbt_free free /*nothing specific to do here. A poor valgrind replacement? */ +#define xbt_free(p) free(p) /*nothing specific to do here. A poor valgrind replacement? */ /** @brief like free, but you can be sure that it is a function */ XBT_PUBLIC(void) xbt_free_f(void *p);