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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/00f0ddf53c25522ba9287c4bdc133cafccb2fe6b

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

commit 00f0ddf53c25522ba9287c4bdc133cafccb2fe6b
Author: unknown <ian@.(none)>
Date:   Sun Jun 5 19:52:42 2011 +0100

    Fix compilation of rts/win32/GetEnv.c

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

 rts/win32/GetEnv.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rts/win32/GetEnv.c b/rts/win32/GetEnv.c
index b8a4395..c472096 100644
--- a/rts/win32/GetEnv.c
+++ b/rts/win32/GetEnv.c
@@ -7,6 +7,7 @@
  * 
---------------------------------------------------------------------------*/
 
 #include "Rts.h"
+#include "RtsUtils.h"
 #include "GetEnv.h"
 
 #include <windows.h>
@@ -40,10 +41,10 @@ void getProgEnvv(int *out_envc, char **out_envv[]) {
         envc++;
     }
 
-    envv = stgMallocBytes(sizeof(char*) * (envc+1));
+    envv = stgMallocBytes(sizeof(char*) * (envc+1), "getProgEnvv");
 
     i = 0;
-    for (envp = env; *envp != NULL; envp += strlen(envp) + 1) {
+    for (envp = env; *envp != 0; envp += strlen(envp) + 1) {
         envv[i] = envp;
         i++;
     }



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to