[project @ 2003-08-22 22:24:12 by sof]

[ghc-hetmet.git] / ghc / rts / RtsStartup.c

diff --git a/ghc/rts/RtsStartup.c b/ghc/rts/RtsStartup.c
index 1c6ab40..0c5c2a3 100644 (file)
--- a/ghc/rts/RtsStartup.c
+++ b/ghc/rts/RtsStartup.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsStartup.c,v 1.73 2003/04/01 15:05:15 sof Exp $
+ * $Id: RtsStartup.c,v 1.75 2003/08/22 22:24:15 sof Exp $
  *
  * (c) The GHC Team, 1998-2002
  *
@@ -56,6 +56,10 @@
 
 #include <stdlib.h>
 
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
 // Flag Structure
 struct RTS_FLAGS RtsFlags;
 
@@ -167,6 +171,10 @@ hs_init(int *argc, char **argv[])
     }
 #endif
 
+#ifdef HAVE_LOCALE_H
+    setlocale(LC_ALL,"");
+#endif
+
     /* Record initialization times */
     stat_endInit();
 }
@@ -189,8 +197,8 @@ startupHaskell(int argc, char *argv[], void (*init_root)(void))
 void
 getProgArgv(int *argc, char **argv[])
 {
-    *argc = prog_argc;
-    *argv = prog_argv;
+    if (argc) { *argc = prog_argc; }
+    if (argv) { *argv = prog_argv; }
 }
 
 void