X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FStg.h;h=7ac6b1a86427e25853412c3dda8749c1569a66aa;hb=63179a7b10069d8f69f5bceef27008c9c7fb0aa8;hp=6cbfeb45e511ee412d3147dcf21cc673157a84bf;hpb=f3052008e4fcd72681b12dfef551d0499eddf6a7;p=ghc-hetmet.git

diff --git a/includes/Stg.h b/includes/Stg.h
index 6cbfeb4..7ac6b1a 100644
--- a/includes/Stg.h
+++ b/includes/Stg.h
@@ -35,9 +35,6 @@
 // Turn on C99 for .hc code.  This gives us the INFINITY and NAN
 // constants from math.h, which we occasionally need to use in .hc (#1861)
 # define _ISOC99_SOURCE
-
-// Turning on _ISOC99_SOURCE means S_ISSOCK gets defined on Linux
-# define _BSD_SOURCE
 #endif
 
 #if IN_STG_CODE == 0
@@ -95,7 +92,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