aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-11-30 15:13:28 +0100
committerSverker Eriksson <[email protected]>2017-11-30 15:13:28 +0100
commitf5e99a55d4d62074d2bd2e5a58c578a31bc214c8 (patch)
tree044eb1b57c7cddd86602e9dadfb7434e46a99305 /erts/doc/src
parent5033b579c012abb52d4bdcca34f0d8f3a678cb22 (diff)
parentec4c31031cce6db591d16f9da52c2a6cc4b90ad3 (diff)
downloadotp-f5e99a55d4d62074d2bd2e5a58c578a31bc214c8.tar.gz
otp-f5e99a55d4d62074d2bd2e5a58c578a31bc214c8.tar.bz2
otp-f5e99a55d4d62074d2bd2e5a58c578a31bc214c8.zip
Merge branch 'maint'
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/erl_nif.xml16
1 files changed, 16 insertions, 0 deletions
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml
index 419e41693e..ef3cdb89e9 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -952,6 +952,8 @@ typedef struct {
<desc>
<p>Allocates memory of <c>size</c> bytes.</p>
<p>Returns <c>NULL</c> if the allocation fails.</p>
+ <p>The returned pointer is suitably aligned for any built-in type that
+ fit in the allocated memory.</p>
</desc>
</func>
@@ -2760,6 +2762,20 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
</func>
<func>
+ <name><ret>void *</ret>
+ <nametext>enif_realloc(void* ptr, size_t size)</nametext></name>
+ <fsummary>Reallocate dynamic memory.</fsummary>
+ <desc>
+ <p>Reallocates memory allocated by
+ <seealso marker="#enif_alloc"><c>enif_alloc</c></seealso> to
+ <c>size</c> bytes.</p>
+ <p>Returns <c>NULL</c> if the reallocation fails.</p>
+ <p>The returned pointer is suitably aligned for any built-in type that
+ fit in the allocated memory.</p>
+ </desc>
+ </func>
+
+ <func>
<name><ret>int</ret>
<nametext>enif_realloc_binary(ErlNifBinary* bin, size_t size)</nametext>
</name>