From caebb3b591d81e9e35dfac26a335d9acad14045f Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 31 May 2018 11:41:39 +0200 Subject: [PATCH] Constructor priorities are still not supported on Apple. Disable constructor priorities since gcc gives an error. Partially reverts commit f12101aa49174017c26e19bc8076f5c7124f9dd0. --- include/xbt/base.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/xbt/base.h b/include/xbt/base.h index f4de224de4..34e588f5b1 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -76,8 +76,13 @@ #define XBT_ATTRIB_DEPRECATED_v323(mesg) \ XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.23)") /* Will be dropped in v3.23 */ -#define XBT_ATTRIB_CONSTRUCTOR(prio) __attribute__((__constructor__(prio))) -#define XBT_ATTRIB_DESTRUCTOR(prio) __attribute__((__destructor__(prio))) +#if !defined(__APPLE__) +# define XBT_ATTRIB_CONSTRUCTOR(prio) __attribute__((__constructor__(prio))) +# define XBT_ATTRIB_DESTRUCTOR(prio) __attribute__((__destructor__(prio))) +#else +# define XBT_ATTRIB_CONSTRUCTOR(prio) __attribute__((__constructor__)) +# define XBT_ATTRIB_DESTRUCTOR(prio) __attribute__((__destructor__)) +#endif #if defined(__GNUC__) # define XBT_ALWAYS_INLINE inline __attribute__ ((always_inline)) -- 2.20.1