diff options
| author | Sverker Eriksson <[email protected]> | 2012-11-28 12:26:30 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-11-28 12:27:36 +0100 |
| commit | 0ba0ffb914fa423ef34faa233f5bd92e9fa753ab (patch) | |
| tree | 20609b83b125c179ab98e2ee0c4b549baae9c2f1 /erts/emulator/beam/erl_nif_api_funcs.h | |
| parent | 4789aa5ab21e86e59fb0098938729d7cd46f385f (diff) | |
| parent | b7b4abaeac8e559a3a4f587d46dc0014332b517e (diff) | |
| download | otp-0ba0ffb914fa423ef34faa233f5bd92e9fa753ab.tar.gz otp-0ba0ffb914fa423ef34faa233f5bd92e9fa753ab.tar.bz2 otp-0ba0ffb914fa423ef34faa233f5bd92e9fa753ab.zip | |
Merge branch 'sverk/crypto-unloading'
* sverk/crypto-unloading:
crypto: Link crypto_callback statically
crypto: Add debug print macros
crypto: Enable runtime upgrade of crypto
crypto: Make unloading of crypto safer
OTP-10596
Diffstat (limited to 'erts/emulator/beam/erl_nif_api_funcs.h')
| -rw-r--r-- | erts/emulator/beam/erl_nif_api_funcs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_nif_api_funcs.h b/erts/emulator/beam/erl_nif_api_funcs.h index 6396af09d0..51ff1eaa48 100644 --- a/erts/emulator/beam/erl_nif_api_funcs.h +++ b/erts/emulator/beam/erl_nif_api_funcs.h @@ -138,6 +138,8 @@ ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_make_uint64,(ErlNifEnv*, ErlNifUInt64)); ERL_NIF_API_FUNC_DECL(int,enif_is_exception,(ErlNifEnv*, ERL_NIF_TERM term)); ERL_NIF_API_FUNC_DECL(int,enif_make_reverse_list,(ErlNifEnv*, ERL_NIF_TERM term, ERL_NIF_TERM *list)); ERL_NIF_API_FUNC_DECL(int,enif_is_number,(ErlNifEnv*, ERL_NIF_TERM term)); +ERL_NIF_API_FUNC_DECL(void*,enif_dlopen,(const char* lib, void (*err_handler)(void*,const char*), void* err_arg)); +ERL_NIF_API_FUNC_DECL(void*,enif_dlsym,(void* handle, const char* symbol, void (*err_handler)(void*,const char*), void* err_arg)); /* ** Add new entries here to keep compatibility on Windows!!! @@ -260,6 +262,8 @@ ERL_NIF_API_FUNC_DECL(int,enif_is_number,(ErlNifEnv*, ERL_NIF_TERM term)); # define enif_is_exception ERL_NIF_API_FUNC_MACRO(enif_is_exception) # define enif_make_reverse_list ERL_NIF_API_FUNC_MACRO(enif_make_reverse_list) # define enif_is_number ERL_NIF_API_FUNC_MACRO(enif_is_number) +# define enif_dlopen ERL_NIF_API_FUNC_MACRO(enif_dlopen) +# define enif_dlsym ERL_NIF_API_FUNC_MACRO(enif_dlsym) /* ** Add new entries here |