diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-05-13 16:48:10 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-05-13 16:48:10 +0200 |
| commit | 4fba4b14c4f9aa03294d8d187fe0dd1202744e82 (patch) | |
| tree | bfcdef0c8ab9e14c1bf149c0a0f0d6b9c8ce39d3 /erts/emulator/beam/erl_nif_api_funcs.h | |
| parent | 66da26c92043c71740ea628469ad6ada747b89bf (diff) | |
| parent | 88095fc0adb871671ff9763bd5868d7c0c0ac350 (diff) | |
| download | otp-4fba4b14c4f9aa03294d8d187fe0dd1202744e82.tar.gz otp-4fba4b14c4f9aa03294d8d187fe0dd1202744e82.tar.bz2 otp-4fba4b14c4f9aa03294d8d187fe0dd1202744e82.zip | |
Merge branch 'egil/erts/nif-format_term/OTP-13580'
* egil/erts/nif-format_term/OTP-13580:
runtime_tools: Change erts_snprintf to enif_snprintf
erts: Document enif_snprintf
erts: Add tests for enif_snprintf
erts: Add enif_snprintf
Conflicts:
erts/emulator/beam/erl_nif_api_funcs.h
Diffstat (limited to 'erts/emulator/beam/erl_nif_api_funcs.h')
| -rw-r--r-- | erts/emulator/beam/erl_nif_api_funcs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_nif_api_funcs.h b/erts/emulator/beam/erl_nif_api_funcs.h index 1bdac51d1f..b211ab4b16 100644 --- a/erts/emulator/beam/erl_nif_api_funcs.h +++ b/erts/emulator/beam/erl_nif_api_funcs.h @@ -174,6 +174,7 @@ ERL_NIF_API_FUNC_DECL(int, enif_term_to_binary, (ErlNifEnv *env, ERL_NIF_TERM te ERL_NIF_API_FUNC_DECL(size_t, enif_binary_to_term, (ErlNifEnv *env, const unsigned char* data, size_t sz, ERL_NIF_TERM *term, unsigned int opts)); ERL_NIF_API_FUNC_DECL(int, enif_port_command, (ErlNifEnv *env, const ErlNifPort* to_port, ErlNifEnv *msg_env, ERL_NIF_TERM msg)); ERL_NIF_API_FUNC_DECL(int,enif_is_on_dirty_scheduler,(ErlNifEnv*)); +ERL_NIF_API_FUNC_DECL(int,enif_snprintf,(char * buffer, size_t size, const char *format, ...)); /* ** ADD NEW ENTRIES HERE (before this comment) !!! @@ -330,6 +331,7 @@ ERL_NIF_API_FUNC_DECL(int,enif_is_on_dirty_scheduler,(ErlNifEnv*)); # define enif_binary_to_term ERL_NIF_API_FUNC_MACRO(enif_binary_to_term) # define enif_port_command ERL_NIF_API_FUNC_MACRO(enif_port_command) # define enif_is_on_dirty_scheduler ERL_NIF_API_FUNC_MACRO(enif_is_on_dirty_scheduler) +# define enif_snprintf ERL_NIF_API_FUNC_MACRO(enif_snprintf) /* ** ADD NEW ENTRIES HERE (before this comment) |