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.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.h')
| -rw-r--r-- | erts/emulator/beam/erl_nif.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h index 02c82415fd..da7a754757 100644 --- a/erts/emulator/beam/erl_nif.h +++ b/erts/emulator/beam/erl_nif.h @@ -49,9 +49,10 @@ ** 2.8: 18.0 add enif_has_pending_exception ** 2.9: 18.2 enif_getenv ** 2.10: Time API +** 2.11: 19.0 enif_snprintf */ #define ERL_NIF_MAJOR_VERSION 2 -#define ERL_NIF_MINOR_VERSION 10 +#define ERL_NIF_MINOR_VERSION 11 /* * The emulator will refuse to load a nif-lib with a major version |