summaryrefslogtreecommitdiff
path: root/includes/Stg.h
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2008-09-18 11:28:56 +0000
committerSimon Marlow <marlowsd@gmail.com>2008-09-18 11:28:56 +0000
commitba1d2fd1914971cd2f9c351670805ea512b6a281 (patch)
treea5b6fd37b7b77340ab49d3556585176ef7c40b6a /includes/Stg.h
parentc55791e1381cfc1a3bddd6c182d32719d48471ce (diff)
downloadhaskell-ba1d2fd1914971cd2f9c351670805ea512b6a281.tar.gz
Fix MacOS X build: don't believe __GNUC_GNU_INLINE__ on MacOS X
Diffstat (limited to 'includes/Stg.h')
-rw-r--r--includes/Stg.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/includes/Stg.h b/includes/Stg.h
index 6cbfeb45e5..32e838090b 100644
--- a/includes/Stg.h
+++ b/includes/Stg.h
@@ -95,7 +95,11 @@
// __attribute__((gnu_inline)). So when we don't have this, we use
// ordinary static inline.
//
-#if defined(__GNUC_GNU_INLINE__)
+// Apple's gcc defines __GNUC_GNU_INLINE__ without providing
+// gnu_inline, so we exclude MacOS X and fall through to the safe
+// version.
+//
+#if defined(__GNUC_GNU_INLINE__) && !defined(__APPLE__)
# if defined(KEEP_INLINES)
# define EXTERN_INLINE inline
# else