aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-02-26 20:54:34 +0100
committerSverker Eriksson <[email protected]>2018-02-26 20:54:34 +0100
commit478b43211bbe96018b63cbf6c6d567550a6e8a2c (patch)
treee51a56d712d83e4fe628f55e3ec4ec841ded5a3f /erts
parent1a0b238c5389e7f39724d390e2e592638b005c47 (diff)
parent7d8d1c67ec71fbf24b8659faf684fbdc7ab79378 (diff)
downloadotp-478b43211bbe96018b63cbf6c6d567550a6e8a2c.tar.gz
otp-478b43211bbe96018b63cbf6c6d567550a6e8a2c.tar.bz2
otp-478b43211bbe96018b63cbf6c6d567550a6e8a2c.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/erl_nif.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml
index 9655fcd994..f2f380ca4e 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -3064,9 +3064,10 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
</name>
<fsummary>Get the pid of the calling process.</fsummary>
<desc>
- <p>Initializes the pid variable <c>*pid</c> to represent the
- calling process.</p>
- <p>Returns <c>pid</c>.</p>
+ <p>Initializes the <seealso marker="#ErlNifPid"><c>ErlNifPid</c></seealso>
+ variable at <c>*pid</c> to represent the calling process.</p>
+ <p>Returns <c>pid</c> if successful, or NULL if <c>caller_env</c> is not
+ a <seealso marker="#ErlNifEnv">process-bound environment</seealso>.</p>
</desc>
</func>