diff options
| author | Patrik Nyblom <[email protected]> | 2012-08-20 18:19:52 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-08-20 18:19:52 +0200 |
| commit | a8fb0d0537314f717f9ab33989a5115457c9aab0 (patch) | |
| tree | 07dcacdaa266c01391a8e422c60c7b6ff9c810cf /erts/emulator/sys/win32/erl_win_sys.h | |
| parent | 00ef468474d0628903e0a3a3abc7aceb8d2c4061 (diff) | |
| parent | a49b1a844febb2740c530895b32c0bb0ae7d5aa0 (diff) | |
| download | otp-a8fb0d0537314f717f9ab33989a5115457c9aab0.tar.gz otp-a8fb0d0537314f717f9ab33989a5115457c9aab0.tar.bz2 otp-a8fb0d0537314f717f9ab33989a5115457c9aab0.zip | |
Merge branch 'maint'
Conflicts:
erts/doc/src/erlang.xml
erts/preloaded/ebin/init.beam
lib/kernel/doc/src/os.xml
lib/stdlib/test/filename_SUITE.erl
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 21c52ca26d..db4b9999d6 100644 --- a/erts/emulator/sys/win32/erl_win_sys.h +++ b/erts/emulator/sys/win32/erl_win_sys.h @@ -176,8 +176,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); |