aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2014-11-07 11:05:24 +0100
committerBruce Yinhe <[email protected]>2014-11-07 11:05:24 +0100
commit983a39ab079c9f825d31cfe349588a76824d8ef2 (patch)
tree3c786022f024d95596b241ec09de792f84afc381 /erts/preloaded/src
parent9884666f91519bec7f63fe925857811cf6385cf7 (diff)
parent1bc59d68f5d22650fa18aa064ed8e50fc9a6a216 (diff)
downloadotp-983a39ab079c9f825d31cfe349588a76824d8ef2.tar.gz
otp-983a39ab079c9f825d31cfe349588a76824d8ef2.tar.bz2
otp-983a39ab079c9f825d31cfe349588a76824d8ef2.zip
Merge branch 'lemenkov/expose_nif_version' into maint
OTP-12298 * lemenkov/expose_nif_version: Expose NIF version
Diffstat (limited to 'erts/preloaded/src')
-rw-r--r--erts/preloaded/src/erlang.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 4ba623d921..611a568014 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2252,6 +2252,7 @@ tuple_to_list(_Tuple) ->
(modified_timing_level) -> integer() | undefined;
(multi_scheduling) -> disabled | blocked | enabled;
(multi_scheduling_blockers) -> [PID :: pid()];
+ (nif_version) -> string();
(otp_release) -> string();
(port_count) -> non_neg_integer();
(port_limit) -> pos_integer();