[commit: ghc] master: Don't have CPP macros expanding to 'defined'. (cb582b6)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/cb582b6476f64c1c86d89dce4d78462581fd2a6f/ghc

>---------------------------------------------------------------

commit cb582b6476f64c1c86d89dce4d78462581fd2a6f
Author: Shea Levy <shea at shealevy.com>
Date:   Tue Dec 13 14:53:50 2016 -0500

    Don't have CPP macros expanding to 'defined'.
    
    Reviewers: austin, simonmar, erikd, bgamari
    
    Reviewed By: erikd, bgamari
    
    Subscribers: angerman, thomie
    
    Differential Revision: https://phabricator.haskell.org/D2823


>---------------------------------------------------------------

cb582b6476f64c1c86d89dce4d78462581fd2a6f
 includes/rts/storage/ClosureMacros.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/includes/rts/storage/ClosureMacros.h b/includes/rts/storage/ClosureMacros.h
index 90198f2..c8c270f 100644
--- a/includes/rts/storage/ClosureMacros.h
+++ b/includes/rts/storage/ClosureMacros.h
@@ -520,8 +520,17 @@ INLINE_HEADER StgWord8 *mutArrPtrsCard (StgMutArrPtrs *a, W_ n)
 
    -------------------------------------------------------------------------- */
 
-#define ZERO_SLOP_FOR_LDV_PROF     (defined(PROFILING))
-#define ZERO_SLOP_FOR_SANITY_CHECK (defined(DEBUG) && !defined(THREADED_RTS))
+#if defined(PROFILING)
+#define ZERO_SLOP_FOR_LDV_PROF 1
+#else
+#define ZERO_SLOP_FOR_LDV_PROF 0
+#endif
+
+#if defined(DEBUG) && !defined(THREADED_RTS)
+#define ZERO_SLOP_FOR_SANITY_CHECK 1
+#else
+#define ZERO_SLOP_FOR_SANITY_CHECK 0
+#endif
 
 #if ZERO_SLOP_FOR_LDV_PROF || ZERO_SLOP_FOR_SANITY_CHECK
 #define OVERWRITING_CLOSURE(c) overwritingClosure(c)