aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src/supervisor.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2011-11-30 11:37:56 +0100
committerSiri Hansen <[email protected]>2011-11-30 11:37:56 +0100
commit81f08713ff0ea3e49c2432e489a74f49ab6ebc42 (patch)
tree7d69a9ec25fbab8a63741cc59f663b7b1c025280 /lib/stdlib/src/supervisor.erl
parent8800c07a30b60ef450e2bac6dd920cccda7483ad (diff)
parent3781b5129a3e43c1c2e5e33d1223e1e17a617be7 (diff)
downloadotp-81f08713ff0ea3e49c2432e489a74f49ab6ebc42.tar.gz
otp-81f08713ff0ea3e49c2432e489a74f49ab6ebc42.tar.bz2
otp-81f08713ff0ea3e49c2432e489a74f49ab6ebc42.zip
Merge branch 'siri/stdlib/dialyzer-supervisor/OTP-9741'
* siri/stdlib/dialyzer-supervisor/OTP-9741: Add test for upgrade of supervisor Fix dialyzer warnings in supervisor
Diffstat (limited to 'lib/stdlib/src/supervisor.erl')
-rw-r--r--lib/stdlib/src/supervisor.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl
index 2dd5ccce7a..42ea42f42e 100644
--- a/lib/stdlib/src/supervisor.erl
+++ b/lib/stdlib/src/supervisor.erl
@@ -37,7 +37,7 @@
%%--------------------------------------------------------------------------
--type child() :: pid() | 'undefined'.
+-type child() :: 'undefined' | pid() | [pid()].
-type child_id() :: term().
-type mfargs() :: {M :: module(), F :: atom(), A :: [term()] | undefined}.
-type modules() :: [module()] | 'dynamic'.