X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4c4671eeabdfa4c951086939613eaccf7f2b973d..96f27c279bcb5dd32cf0e8af04bd273240d298ef:/include/xbt/base.h diff --git a/include/xbt/base.h b/include/xbt/base.h index 4347e66ffd..a1b6319488 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -16,9 +16,6 @@ #define _GNU_SOURCE #endif -/* Attributes are only in recent versions of GCC */ -#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)) - /* On MinGW, stdio.h defines __MINGW_PRINTF_FORMAT and __MINGW_SCANF_FORMAT which are the suitable format style (either gnu_printf or ms_printf) depending on which version is available (__USE_MINGW_ANSI_STDIO): */ @@ -56,49 +53,12 @@ # endif # undef _XBT_NEED_INIT_PRAGMA -#elif defined(_MSC_VER) /* Microsoft Visual Thing */ -# define XBT_ATTRIB_PRINTF( format_idx, arg_idx ) -# define XBT_ATTRIB_SCANF( format_idx, arg_idx ) -# define XBT_ATTRIB_NORETURN __declspec(noreturn) -# define XBT_ATTRIB_UNUSED -# define _XBT_GNUC_CONSTRUCTOR(prio) -# define _XBT_GNUC_DESTRUCTOR(prio) -# define _XBT_NEED_INIT_PRAGMA 1 -#else -# define XBT_ATTRIB_PRINTF( format_idx, arg_idx ) -# define XBT_ATTRIB_SCANF( format_idx, arg_idx ) -# define XBT_ATTRIB_NORETURN -# define XBT_ATTRIB_UNUSED -# define _XBT_GNUC_CONSTRUCTOR(prio) -# define _XBT_GNUC_DESTRUCTOR(prio) -# define _XBT_NEED_INIT_PRAGMA 1 - -#endif /* gcc or MSVC else */ - -/* inline and __FUNCTION__ are only in GCC when -ansi is off */ - -#if defined(__GNUC__) && ! defined(__STRICT_ANSI__) -# define _XBT_FUNCTION __FUNCTION__ -#elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) -# define _XBT_FUNCTION __func__ /* ISO-C99 compliant */ -#else -# define _XBT_FUNCTION "function" -#endif - #if defined(__GNUC__) # define XBT_ALWAYS_INLINE inline __attribute__ ((always_inline)) #else # define XBT_ALWAYS_INLINE inline #endif -#if defined(__GNUC__) -# define XBT_THREAD_LOCAL __thread -#elif defined(_MSC_VER) -# define XBT_THREAD_LOCAL __declspec(thread) -#else -# define XBT_THREAD_LOCAL No thread local on this architecture -#endif - /* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */ #ifdef MIN # undef MIN