diff options
| author | Andreas Klebinger <klebinger.andreas@gmx.at> | 2017-07-27 18:16:09 +0100 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2017-07-27 21:16:02 +0100 |
| commit | 7af0b906116e13fbd90f43f2f6c6b826df2dca77 (patch) | |
| tree | 4da8912ab0408e22b119098dd64260b32e935bd9 /includes | |
| parent | 791947db6db32ef7d4772a821a0823e558e3c05b (diff) | |
| download | haskell-7af0b906116e13fbd90f43f2f6c6b826df2dca77.tar.gz | |
Initialize hs_init with UTF8 encoded arguments on Windows.
Summary:
Get utf8 encoded arguments before we call hs_init and use them
instead of ignoring hs_init arguments. This reduces differing
behaviour of the RTS between windows and linux and simplifies
the code involved.
A few testcases were changed to expect the same result on windows
as on linux after the changes.
This fixes #13940.
Test Plan: ./validate
Reviewers: austin, hvr, bgamari, erikd, simonmar, Phyx
Subscribers: Phyx, rwbarton, thomie
GHC Trac Issues: #13940
Differential Revision: https://phabricator.haskell.org/D3739
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/Rts.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/includes/Rts.h b/includes/Rts.h index aca24e4f28..a59a8ca432 100644 --- a/includes/Rts.h +++ b/includes/Rts.h @@ -211,12 +211,6 @@ DLL_IMPORT_RTS extern char **prog_argv; /* so we can get at these from Haskell * DLL_IMPORT_RTS extern int prog_argc; DLL_IMPORT_RTS extern char *prog_name; -#if defined(mingw32_HOST_OS) -// We need these two from Haskell too -void getWin32ProgArgv(int *argc, wchar_t **argv[]); -void setWin32ProgArgv(int argc, wchar_t *argv[]); -#endif - void reportStackOverflow(StgTSO* tso); void reportHeapOverflow(void); |