[commit: ghc] master: HscMain: Place CPP macro invocation on one line (4cdab73)

[git at git.haskell.org]

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

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

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

commit 4cdab73f084fda8ea0538908f8d266c800a8b586
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Sep 22 14:14:32 2015 +0200

    HscMain: Place CPP macro invocation on one line
    
    Clang's CPP implementation seems to barf otherwise


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

4cdab73f084fda8ea0538908f8d266c800a8b586
 compiler/main/HscMain.hs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs
index 00cff28..e5c6ce1 100644
--- a/compiler/main/HscMain.hs
+++ b/compiler/main/HscMain.hs
@@ -804,8 +804,7 @@ hscMergeFrontEnd hsc_env mod_summary = do
 -- 'TcGblEnv' resulting from type-checking.
 hscFileFrontEnd :: ModSummary -> Hsc TcGblEnv
 hscFileFrontEnd mod_summary = do
-    MASSERT( ms_hsc_src mod_summary == HsBootFile ||
-             ms_hsc_src mod_summary == HsSrcFile )
+    MASSERT( ms_hsc_src mod_summary == HsBootFile || ms_hsc_src mod_summary == HsSrcFile )
     hpm <- hscParse' mod_summary
     hsc_env <- getHscEnv
     tcg_env <- tcRnModule' hsc_env mod_summary False hpm