diff options
| author | Sverker Eriksson <[email protected]> | 2016-05-27 15:27:19 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-05-27 15:27:19 +0200 |
| commit | 23b38b4409d52eeb42d87202c49867295b066c47 (patch) | |
| tree | 6aebd99b44200341c5a17f45ea1d2fbf42187773 /lib/stdlib | |
| parent | af9e26bc0cdbbd1a5a81e760501c307c3176fea0 (diff) | |
| parent | 0f8fab10dad03273b75f205bd9fae746d2077829 (diff) | |
| download | otp-23b38b4409d52eeb42d87202c49867295b066c47.tar.gz otp-23b38b4409d52eeb42d87202c49867295b066c47.tar.bz2 otp-23b38b4409d52eeb42d87202c49867295b066c47.zip | |
Merge branch 'richcarl/erts/fix-init-stop/PR-911/OTP-13630/OTP-13631'
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/src/erl_compile.erl | 1 | ||||
| -rw-r--r-- | lib/stdlib/src/escript.erl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/stdlib/src/erl_compile.erl b/lib/stdlib/src/erl_compile.erl index ef54076ee3..a6ae398d03 100644 --- a/lib/stdlib/src/erl_compile.erl +++ b/lib/stdlib/src/erl_compile.erl @@ -60,6 +60,7 @@ compile_cmdline() -> _ -> my_halt(2) end. +-spec my_halt(_) -> no_return(). my_halt(Reason) -> erlang:halt(Reason). diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl index b8ce311c35..f53b0e2246 100644 --- a/lib/stdlib/src/escript.erl +++ b/lib/stdlib/src/escript.erl @@ -906,6 +906,7 @@ anno(L) -> fatal(Str) -> throw(Str). +-spec my_halt(_) -> no_return(). my_halt(Reason) -> erlang:halt(Reason). |