aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-08-21 16:43:03 +0200
committerBjörn-Egil Dahlberg <[email protected]>2014-08-21 16:43:03 +0200
commitae9c3f7b755d5ebf4e65146d81d04c2d48b4d9c9 (patch)
tree222b68e94768df505415a004a3e1633cc749c8f6 /lib
parenta499a783bd7edbba856e61e490137dea4dab67e3 (diff)
parented5a0b9cdf6a7e87cec1a50c6e9adb29698ce8d9 (diff)
downloadotp-ae9c3f7b755d5ebf4e65146d81d04c2d48b4d9c9.tar.gz
otp-ae9c3f7b755d5ebf4e65146d81d04c2d48b4d9c9.tar.bz2
otp-ae9c3f7b755d5ebf4e65146d81d04c2d48b4d9c9.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/src/proc_lib.erl6
-rw-r--r--lib/stdlib/src/stdlib.app.src2
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/stdlib/src/proc_lib.erl b/lib/stdlib/src/proc_lib.erl
index c925e70613..8792ff44d3 100644
--- a/lib/stdlib/src/proc_lib.erl
+++ b/lib/stdlib/src/proc_lib.erl
@@ -217,10 +217,8 @@ ensure_link(SpawnOpts) ->
init_p(Parent, Ancestors, Fun) when is_function(Fun) ->
put('$ancestors', [Parent|Ancestors]),
- {module,Mod} = erlang:fun_info(Fun, module),
- {name,Name} = erlang:fun_info(Fun, name),
- {arity,Arity} = erlang:fun_info(Fun, arity),
- put('$initial_call', {Mod,Name,Arity}),
+ Mfa = erlang:fun_info_mfa(Fun),
+ put('$initial_call', Mfa),
try
Fun()
catch
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index c25ab41a54..f134c75869 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -102,7 +102,7 @@
dets]},
{applications, [kernel]},
{env, []},
- {runtime_dependencies, ["sasl-2.4","kernel-3.0.2","erts-6.1.2","crypto-3.3",
+ {runtime_dependencies, ["sasl-2.4","kernel-3.0.2","erts-6.2","crypto-3.3",
"compiler-5.0"]}
]}.