diff options
author | Sverker Eriksson <[email protected]> | 2013-12-20 14:25:03 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2013-12-20 14:25:35 +0100 |
commit | 1e4f6c5e85a821333dc1cea38d057fb92547e160 (patch) | |
tree | 26a0075dce302f2d3dd025d4b1c17494b5c0cb7a /erts/emulator/beam/erl_bif_port.c | |
parent | 6f0b3bd3fc28de703490470630922873775c97f5 (diff) | |
parent | 21408235bd6915001cbc5051a1b7c38a3fef9d05 (diff) | |
download | otp-1e4f6c5e85a821333dc1cea38d057fb92547e160.tar.gz otp-1e4f6c5e85a821333dc1cea38d057fb92547e160.tar.bz2 otp-1e4f6c5e85a821333dc1cea38d057fb92547e160.zip |
Merge branch 'sverk/unicode-driver-paths'
OTP-11549
* sverk/unicode-driver-paths:
erts: Support loading of drivers with unicode paths
erts: Add 'extra' argument to erts_convert_filename_to_encoding
erts: Refactor remove erts_sys_dll_open2
erts: Fix compiler warning
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 864349491a..f298422267 100644 --- a/erts/emulator/beam/erl_bif_port.c +++ b/erts/emulator/beam/erl_bif_port.c @@ -808,7 +808,7 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump) if (encoding == ERL_FILENAME_WIN_WCHAR) { encoding = ERL_FILENAME_UTF8; } - if ((name_buf = erts_convert_filename_to_encoding(name, NULL, 0, ERTS_ALC_T_TMP,0,1, encoding, NULL)) + if ((name_buf = erts_convert_filename_to_encoding(name, NULL, 0, ERTS_ALC_T_TMP,0,1, encoding, NULL, 0)) == NULL) { goto badarg; } |