From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 31 May 2018 09:41:39 +0000 (+0200)
Subject: Constructor priorities are still not supported on Apple.
X-Git-Tag: v3.20~184
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/caebb3b591d81e9e35dfac26a335d9acad14045f?ds=sidebyside

Constructor priorities are still not supported on Apple.

Disable constructor priorities since gcc gives an error.

Partially reverts commit f12101aa49174017c26e19bc8076f5c7124f9dd0.
---

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))