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/erl_win_sys.h | |
| 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/erl_win_sys.h')
| -rw-r--r-- | erts/emulator/sys/win32/erl_win_sys.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/win32/erl_win_sys.h b/erts/emulator/sys/win32/erl_win_sys.h index 03298a6c54..1e7b555f42 100644 --- a/erts/emulator/sys/win32/erl_win_sys.h +++ b/erts/emulator/sys/win32/erl_win_sys.h @@ -171,8 +171,8 @@ extern clock_t sys_times(SysTimes *buffer); extern char *win_build_environment(char *); typedef struct { - char *environment_strings; - char *next_string; + WCHAR *environment_strings; + WCHAR *next_string; } GETENV_STATE; void erts_sys_env_init(void); |