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/global.h | |
| 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/global.h')
| -rwxr-xr-x | erts/emulator/beam/global.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 94bc1b172a..6e5d352e5b 100755 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -921,7 +921,8 @@ char *erts_convert_filename_to_encoding(Eterm name, char *statbuf, ErtsAlcType_t alloc_type, int allow_empty, int allow_atom, int encoding, - Sint *used /* out */); + Sint *used /* out */, + Uint extra); char* erts_convert_filename_to_wchar(byte* bytes, Uint size, char *statbuf, size_t statbuf_size, ErtsAlcType_t alloc_type, Sint* used, |