projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
c55791e
)
Fix MacOS X build: don't believe __GNUC_GNU_INLINE__ on MacOS X
author
Simon Marlow
<marlowsd@gmail.com>
Thu, 18 Sep 2008 11:28:56 +0000
(11:28 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Thu, 18 Sep 2008 11:28:56 +0000
(11:28 +0000)
includes/Stg.h
patch
|
blob
|
history
diff --git
a/includes/Stg.h
b/includes/Stg.h
index
6cbfeb4
..
32e8380
100644
(file)
--- 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