[commit: ghc] wip/erikd/rts: wip (ba36d63)

[git at git.haskell.org]

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

On branch  : wip/erikd/rts
Link       : http://ghc.haskell.org/trac/ghc/changeset/ba36d63018493e374a217d0ed123eb81e37c2a74/ghc

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

commit ba36d63018493e374a217d0ed123eb81e37c2a74
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Thu Oct 20 20:41:48 2016 +1100

    wip


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

ba36d63018493e374a217d0ed123eb81e37c2a74
 rts/Linker.c | 2 +-
 rts/sm/CNF.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 12ca4b6..066804b 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -1370,7 +1370,7 @@ static SymbolAddr* lookupSymbol_ (SymbolName* lbl)
         return NULL;
 #       endif
     } else {
-#if defined(mingw32_HOST_OS)
+#if mingw32_HOST_OS
             // If Windows, perform initialization of uninitialized
             // Symbols from the C runtime which was loaded above.
             // We do this on lookup to prevent the hit when
diff --git a/rts/sm/CNF.c b/rts/sm/CNF.c
index f8e706a..fa743dc 100644
--- a/rts/sm/CNF.c
+++ b/rts/sm/CNF.c
@@ -1334,7 +1334,7 @@ compactFixupPointers(StgCompactNFData *str,
     dbl_link_onto(bd, &g0->compact_objects);
     RELEASE_SM_LOCK;
 
-#if DEBUG
+#if defined(DEBUG)
     if (root)
         verify_consistency_loop(str);
 #endif