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/sys.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/sys.h')
| -rw-r--r-- | erts/emulator/beam/sys.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index d0ccf8a2fc..189d9ebac8 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -667,8 +667,7 @@ typedef struct { #define ERTS_SYS_DDLL_ERROR_INIT {NULL} extern void erts_sys_ddll_free_error(ErtsSysDdllError*); extern void erl_sys_ddll_init(void); /* to initialize mutexes etc */ -extern int erts_sys_ddll_open2(const char *path, void **handle, ErtsSysDdllError*); -#define erts_sys_ddll_open(P,H) erts_sys_ddll_open2(P,H,NULL) +extern int erts_sys_ddll_open(const char *path, void **handle, ErtsSysDdllError*); extern int erts_sys_ddll_open_noext(char *path, void **handle, ErtsSysDdllError*); extern int erts_sys_ddll_load_driver_init(void *handle, void **function); extern int erts_sys_ddll_load_nif_init(void *handle, void **function,ErtsSysDdllError*); |