diff options
| author | Rickard Green <[email protected]> | 2017-10-12 16:30:38 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-10-12 16:30:38 +0200 |
| commit | 55693961fbb6371d2c3ec0a426f30b8acace6ed1 (patch) | |
| tree | 7debd0d509349e26508c211763f1865652c623ef /erts/emulator/beam/erl_bif_port.c | |
| parent | 4900f9886cc80ecf34f9590829878da937e75422 (diff) | |
| parent | f28539265d753bbaa473cb488e951bfe47304a01 (diff) | |
| download | otp-55693961fbb6371d2c3ec0a426f30b8acace6ed1.tar.gz otp-55693961fbb6371d2c3ec0a426f30b8acace6ed1.tar.bz2 otp-55693961fbb6371d2c3ec0a426f30b8acace6ed1.zip | |
Merge branch 'maint'
* maint:
Revert "Merge branch 'rickard/null-char-filenames/ERL-370/OTP-14543' into maint"
Diffstat (limited to 'erts/emulator/beam/erl_bif_port.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_port.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_port.c b/erts/emulator/beam/erl_bif_port.c index 3b8e70d44a..4b73be55c6 100644 --- a/erts/emulator/beam/erl_bif_port.c +++ b/erts/emulator/beam/erl_bif_port.c @@ -1076,7 +1076,7 @@ static byte* convert_environment(Process* p, Eterm env) goto done; } - if ((size = erts_native_filename_need(all, encoding, 1)) < 0) { + if ((size = erts_native_filename_need(all,encoding)) < 0) { goto done; } |