diff options
| author | Siri Hansen <[email protected]> | 2013-11-18 12:05:29 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-11-18 12:05:29 +0100 |
| commit | b5e8344a22b04729db5493f2757ee68c45d03bc0 (patch) | |
| tree | 627db3c8b3635513a71fecf56a9351ef776bc7f7 /erts | |
| parent | fb0006c937e284cefe5217d4c2a4b45ff7dfb758 (diff) | |
| parent | c8f93bbcf1af2e41683f1b23acc2f51e637870b8 (diff) | |
| download | otp-b5e8344a22b04729db5493f2757ee68c45d03bc0.tar.gz otp-b5e8344a22b04729db5493f2757ee68c45d03bc0.tar.bz2 otp-b5e8344a22b04729db5493f2757ee68c45d03bc0.zip | |
Merge branch 'siri/erl_prim_loader/normalize-and-backslash/OTP-11170' into maint
* siri/erl_prim_loader/normalize-and-backslash/OTP-11170:
Update preloaded
Fix bug with backslash in erl_prim_loader:normalize/1
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/preloaded/ebin/erl_prim_loader.beam | bin | 54536 -> 54672 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erl_prim_loader.erl | 7 |
2 files changed, 6 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam Binary files differindex f51ccfe8ce..ece0e6d5e8 100644 --- a/erts/preloaded/ebin/erl_prim_loader.beam +++ b/erts/preloaded/ebin/erl_prim_loader.beam diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl index e8ddfc4a57..fc43d1d4fa 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]); [] -> |