From 7c4af07d8b74d00ae29a94eff22346fdfcbb8214 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 23 May 2012 17:20:02 +0200 Subject: [PATCH] Cannot use a variable defined on command line here. It won't work with user code (unless the user defines the same variable). Use a variable known to be defined by gcc on macs. --- include/xbt/log.h | 4 ++-- include/xbt/misc.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/xbt/log.h b/include/xbt/log.h index d4225712e1..1dcdfde590 100644 --- a/include/xbt/log.h +++ b/include/xbt/log.h @@ -90,8 +90,8 @@ typedef enum { #define _XBT_LOGV_CTOR(cat) _XBT_LOG_CONCAT2(_XBT_LOGV(cat), __constructor__) #define _XBT_LOG_CONCAT(x, y) x ## y #define _XBT_LOG_CONCAT2(x, y) _XBT_LOG_CONCAT(x, y) -/* Apparently, constructor priorities are not supported on Macs */ -#if APPLE +/* Apparently, constructor priorities are not supported by gcc on Macs */ +#if __GNUC__ && __APPLE__ # define _XBT_LOGV_CTOR_ATTRIBUTE #else # define _XBT_LOGV_CTOR_ATTRIBUTE _XBT_GNUC_CONSTRUCTOR(600) diff --git a/include/xbt/misc.h b/include/xbt/misc.h index 314dd88a43..2c571277c8 100644 --- a/include/xbt/misc.h +++ b/include/xbt/misc.h @@ -17,8 +17,8 @@ __attribute__((__format__ (__scanf__, format_idx, arg_idx))) # define _XBT_GNUC_NORETURN __attribute__((__noreturn__)) # define _XBT_GNUC_UNUSED __attribute__((__unused__)) -/* Apparently, constructor priorities are not supported on Macs */ -# if APPLE +/* Apparently, constructor priorities are not supported by gcc on Macs */ +# if __APPLE__ # define _XBT_GNUC_CONSTRUCTOR(prio) __attribute__((__constructor__)) # define _XBT_GNUC_DESTRUCTOR(prio) __attribute__((__destructor__)) # else -- 2.20.1