diff options
| author | Patrik Nyblom <[email protected]> | 2012-08-20 17:52:49 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-08-20 17:52:49 +0200 |
| commit | a49b1a844febb2740c530895b32c0bb0ae7d5aa0 (patch) | |
| tree | 6e005b76b80ef0c8f629f291986087f51cbd5aff /erts/emulator/sys/win32/sys.c | |
| parent | 4e8f6f2e2cdec0e94f5b4e1a1a878190e4d01704 (diff) | |
| parent | 0c387e88d5a6dc97466ec33088aa9798eeb1d16d (diff) | |
| download | otp-a49b1a844febb2740c530895b32c0bb0ae7d5aa0.tar.gz otp-a49b1a844febb2740c530895b32c0bb0ae7d5aa0.tar.bz2 otp-a49b1a844febb2740c530895b32c0bb0ae7d5aa0.zip | |
Merge branch 'pan/unicode_home/OTP-10160' into maint
* pan/unicode_home/OTP-10160:
Teach release_handler_SUITE about file:native_name_encoding/0
Add documetation about Unicode in environment
Make get/putenv and erlexec understand Unicode
Diffstat (limited to 'erts/emulator/sys/win32/sys.c')
| -rwxr-xr-x | erts/emulator/sys/win32/sys.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c index acbbfc2ce9..29e2749800 100755 --- a/erts/emulator/sys/win32/sys.c +++ b/erts/emulator/sys/win32/sys.c @@ -1204,9 +1204,7 @@ spawn_start(ErlDrvPort port_num, char* name, SysDriverOpts* opts) */ DEBUGF(("Spawning \"%s\"\n", name)); - envir = win_build_environment(envir); /* Still an ansi environment, could be - converted to unicode for spawn_executable, but - that is not done (yet) */ + envir = win_build_environment(envir); /* Always a unicode environment */ ok = create_child_process(name, hChildStdin, hChildStdout, @@ -1485,7 +1483,8 @@ create_child_process NULL, NULL, TRUE, - createFlags | staticCreateFlags, + createFlags | staticCreateFlags | + CREATE_UNICODE_ENVIRONMENT, env, wd, &siStartInfo, @@ -1613,7 +1612,8 @@ create_child_process NULL, NULL, TRUE, - createFlags | staticCreateFlags, + createFlags | staticCreateFlags | + CREATE_UNICODE_ENVIRONMENT, env, (WCHAR *) wd, &siStartInfo, |