diff options
| author | Siri Hansen <[email protected]> | 2013-11-18 13:19:14 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-11-18 13:19:14 +0100 |
| commit | 966b7e7a26978667c16450db2f35bdf0ac4f3eb8 (patch) | |
| tree | 9b617a98398c0c72aa300c1836fd3a295d2f7257 /erts/preloaded/src | |
| parent | 58fb18b66eca3de6af4f33f5447fd8de63adf3a8 (diff) | |
| parent | b5e8344a22b04729db5493f2757ee68c45d03bc0 (diff) | |
| download | otp-966b7e7a26978667c16450db2f35bdf0ac4f3eb8.tar.gz otp-966b7e7a26978667c16450db2f35bdf0ac4f3eb8.tar.bz2 otp-966b7e7a26978667c16450db2f35bdf0ac4f3eb8.zip | |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/erl_prim_loader.beam
Diffstat (limited to 'erts/preloaded/src')
| -rw-r--r-- | erts/preloaded/src/erl_prim_loader.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl index 81522e293a..4b9e901c6d 100644 --- a/erts/preloaded/src/erl_prim_loader.erl +++ b/erts/preloaded/src/erl_prim_loader.erl @@ -1439,7 +1439,12 @@ normalize(Name, Acc) -> [Atom | Rest] when is_atom(Atom) -> normalize(atom_to_list(Atom) ++ Rest, Acc); [$\\ | Chars] -> - normalize(Chars, [$/ | Acc]); + case erlang:system_info(os_type) of + {win32, _} -> + normalize(Chars, [$/ | Acc]); + _ -> + normalize(Chars, [$\\ | Acc]) + end; [Char | Chars] -> normalize(Chars, [Char | Acc]); [] -> |