diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-04-05 12:01:12 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-04-05 12:12:48 -0400 |
| commit | 819c3db73acf5246cd332ad3062c61b7a2e8ee68 (patch) | |
| tree | 7425f16a8771d1bb917afb65b848ebf855c8c619 /includes/Stg.h | |
| parent | 4a1eed40bec08d50634b9754448ae34666e71fb2 (diff) | |
| download | haskell-819c3db73acf5246cd332ad3062c61b7a2e8ee68.tar.gz | |
Revert "Enable new warning for fragile/incorrect CPP #if usage"
This is causing too much platform dependent breakage at the moment. We
will need a more rigorous testing strategy before this can be
merged again.
This reverts commit 7e340c2bbf4a56959bd1e95cdd1cfdb2b7e537c2.
Diffstat (limited to 'includes/Stg.h')
| -rw-r--r-- | includes/Stg.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/Stg.h b/includes/Stg.h index 88c8794726..939bed6444 100644 --- a/includes/Stg.h +++ b/includes/Stg.h @@ -147,7 +147,7 @@ // to force gnu90-style 'external inline' semantics. #if defined(FORCE_GNU_INLINE) // disable auto-detection since HAVE_GNU_INLINE has been defined externally -#elif defined(__GNUC_GNU_INLINE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 +#elif __GNUC_GNU_INLINE__ && __GNUC__ == 4 && __GNUC_MINOR__ == 2 // GCC 4.2.x didn't properly support C99 inline semantics (GCC 4.3 was the first // release to properly support C99 inline semantics), and therefore warned when // using 'extern inline' while in C99 mode unless `__attributes__((gnu_inline))` @@ -155,14 +155,14 @@ # define FORCE_GNU_INLINE 1 #endif -#ifdef FORCE_GNU_INLINE +#if FORCE_GNU_INLINE // Force compiler into gnu90 semantics # if defined(KEEP_INLINES) # define EXTERN_INLINE inline __attribute__((gnu_inline)) # else # define EXTERN_INLINE extern inline __attribute__((gnu_inline)) # endif -#elif defined(__GNUC_GNU_INLINE__) +#elif __GNUC_GNU_INLINE__ // we're currently in gnu90 inline mode by default and // __attribute__((gnu_inline)) may not be supported, so better leave it off # if defined(KEEP_INLINES) |