summaryrefslogtreecommitdiff
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <sverker@erlang.org>2018-02-26 20:53:56 +0100
committerSverker Eriksson <sverker@erlang.org>2018-02-26 20:53:56 +0100
commit7d8d1c67ec71fbf24b8659faf684fbdc7ab79378 (patch)
tree6d59d2dcafd680ab8efe57c5b735fa4ca609c644 /erts
parent8bc23cd3da3c5c80a401bfea0738c007dbd21f85 (diff)
parent9298482871dec324fb757bce52f15474f4525ebe (diff)
downloaderlang-7d8d1c67ec71fbf24b8659faf684fbdc7ab79378.tar.gz
Merge branch 'sverker/enif_self-doc' into maint
* sverker/enif_self-doc: erts: Clarify enif_self docs
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 ef3cdb89e9..b9c2e70b57 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -3044,9 +3044,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>