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/sys.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/sys.h')
| -rw-r--r-- | erts/emulator/beam/sys.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index 8957bb5bde..c5af5b9577 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -618,7 +618,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(char *path, void **handle, ErtsSysDdllError*); +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_noext(char *path, void **handle, ErtsSysDdllError*); extern int erts_sys_ddll_load_driver_init(void *handle, void **function); @@ -627,7 +627,7 @@ extern int erts_sys_ddll_close2(void *handle, ErtsSysDdllError*); #define erts_sys_ddll_close(H) erts_sys_ddll_close2(H,NULL) extern void *erts_sys_ddll_call_init(void *function); extern void *erts_sys_ddll_call_nif_init(void *function); -extern int erts_sys_ddll_sym2(void *handle, char *name, void **function, ErtsSysDdllError*); +extern int erts_sys_ddll_sym2(void *handle, const char *name, void **function, ErtsSysDdllError*); #define erts_sys_ddll_sym(H,N,F) erts_sys_ddll_sym2(H,N,F,NULL) extern char *erts_sys_ddll_error(int code); |