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/sys/win32/erl_win32_sys_ddll.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/sys/win32/erl_win32_sys_ddll.c')
| -rw-r--r-- | erts/emulator/sys/win32/erl_win32_sys_ddll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/win32/erl_win32_sys_ddll.c b/erts/emulator/sys/win32/erl_win32_sys_ddll.c index 2d3f073cc2..338f0d7386 100644 --- a/erts/emulator/sys/win32/erl_win32_sys_ddll.c +++ b/erts/emulator/sys/win32/erl_win32_sys_ddll.c @@ -59,7 +59,7 @@ void erl_sys_ddll_init(void) { * Open a shared object * Expecting 'full_name' as an UTF-8 string. */ -int erts_sys_ddll_open2(const char *full_name, void **handle, ErtsSysDdllError* err) +int erts_sys_ddll_open(const char *full_name, void **handle, ErtsSysDdllError* err) { HINSTANCE hinstance; int len; |