[commit: ghc] master: Fix -Werror build failure in RtsMain (e673b84)

git at git.haskell.org git at git.haskell.org
Wed Mar 4 01:39:42 UTC 2015


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

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

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

commit e673b8408d84f9149f88964c3318059984eb7788
Author: Tamar Christina <tamar at zhox.com>
Date:   Tue Mar 3 19:41:43 2015 -0600

    Fix -Werror build failure in RtsMain
    
    Summary:
    Something in Excn.h's include chain is loading _mingw.h which is defining a macro that
    PosixSource.h is going to define.
    
    _mingw.h's version properly checks if it has already been defined and skips it, so fixing the warning can be done
    by just including Excn.h later (moved it to before last include).
    
    Test Plan: ./validate
    
    Reviewers: austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D698


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

e673b8408d84f9149f88964c3318059984eb7788
 rts/RtsMain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rts/RtsMain.c b/rts/RtsMain.c
index 667c9e4..154eafa 100644
--- a/rts/RtsMain.c
+++ b/rts/RtsMain.c
@@ -8,7 +8,6 @@
 
 #define COMPILING_RTS_MAIN
 
-#include "Excn.h"
 #include "PosixSource.h"
 #include "Rts.h"
 #include "RtsAPI.h"
@@ -16,6 +15,7 @@
 #include "RtsUtils.h"
 #include "Prelude.h"
 #include "Task.h"
+#include "Excn.h"
 
 #ifdef DEBUG
 # include "Printer.h"   /* for printing        */



More information about the ghc-commits mailing list