diff options
| author | Darin Morrison <darinmorrison+git@gmail.com> | 2013-09-26 00:32:17 -0600 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2013-10-11 23:08:00 -0500 |
| commit | 8878541d02ad15fbdbd04608cbc6ea3fde5d5beb (patch) | |
| tree | 4323a214b9d146bbc5c16b9ab5630a7912c9a941 | |
| parent | feb76385b6eb88ceb8c3bd0a21d9723a607e2944 (diff) | |
| download | haskell-8878541d02ad15fbdbd04608cbc6ea3fde5d5beb.tar.gz | |
Fix building RtsProbes.d on Mac OS X 10.9 (#8139)
Signed-off-by: Austin Seipp <austin@well-typed.com>
| -rw-r--r-- | includes/HsFFI.h | 2 | ||||
| -rw-r--r-- | rts/RtsProbes.d | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/includes/HsFFI.h b/includes/HsFFI.h index 652fbea22b..a21811efb5 100644 --- a/includes/HsFFI.h +++ b/includes/HsFFI.h @@ -21,7 +21,7 @@ extern "C" { #include "stg/Types.h" /* get limits for integral types */ -#ifdef HAVE_STDINT_H +#if defined HAVE_STDINT_H && !defined USE_INTTYPES_H_FOR_RTS_PROBES_D /* ISO C 99 says: * "C++ implementations should define these macros only when * __STDC_LIMIT_MACROS is defined before <stdint.h> is included." diff --git a/rts/RtsProbes.d b/rts/RtsProbes.d index 13f40f8201..226f881117 100644 --- a/rts/RtsProbes.d +++ b/rts/RtsProbes.d @@ -6,6 +6,12 @@ * * ---------------------------------------------------------------------------*/ +#ifdef __APPLE__ && __MACH__ +# if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +# define USE_INTTYPES_H_FOR_RTS_PROBES_D +# endif +#endif + #include "HsFFI.h" #include "rts/EventLogFormat.h" |