[commit: ghc] master: Fix recent rts flags changes on windows (d518e8f)

Duncan Coutts duncan.coutts at googlemail.com
Mon Oct 31 12:41:20 CET 2011


Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/d518e8f1a6f111575aba37bb0b0ba00168ad7fcd

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

commit d518e8f1a6f111575aba37bb0b0ba00168ad7fcd
Author: Duncan Coutts <duncan at well-typed.com>
Date:   Mon Oct 31 11:39:15 2011 +0000

    Fix recent rts flags changes on windows
    
    I naively assumed that mingw would not have unistd.h or sys/types
    but it has both, yet does not have getuid() and friends.

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

 rts/RtsFlags.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index c3784ad..bd2bf67 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -536,7 +536,7 @@ void setupRtsFlags (int *argc, char *argv[])
 
 static void checkSuid(RtsOptsEnabledEnum enabled)
 {
-#if defined(HAVE_UNISTD_H) && defined(HAVE_SYS_TYPES_H)
+#if defined(HAVE_UNISTD_H) && defined(HAVE_SYS_TYPES_H) && !defined(mingw32_HOST_OS)
     if (enabled == RtsOptsSafeOnly) {
 	/* This doesn't cover linux/posix capabilities like CAP_DAC_OVERRIDE,
 	   we'd have to link with -lcap for that. */





More information about the Cvs-ghc mailing list