diff options
| author | Raimo Niskanen <[email protected]> | 2012-03-22 11:29:28 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2012-03-22 11:29:28 +0100 |
| commit | 1e13b92d5c6543c82219610aa1336dbdf1f4dc2d (patch) | |
| tree | 537e3b12c7e2c66b2b79c5bd1b6790821434ac91 /lib/stdlib/src/erl_internal.erl | |
| parent | b2b96f8b37143e760cfe6638c6c4b3bd34604e1f (diff) | |
| parent | 4cb0e5bc5227eaf675bb633f77e838b7297be87d (diff) | |
| download | otp-1e13b92d5c6543c82219610aa1336dbdf1f4dc2d.tar.gz otp-1e13b92d5c6543c82219610aa1336dbdf1f4dc2d.tar.bz2 otp-1e13b92d5c6543c82219610aa1336dbdf1f4dc2d.zip | |
Merge branch 'raimo/close-ports-on-halt/OTP-9985' into maint
* raimo/close-ports-on-halt/OTP-9985:
erts: Basic test of erlang:halt/0..2
erts: Document erlang:halt/2 and update erlang:halt/0,1
erts: Implement erlang:halt/2
stdlib: Stop working around erlang:halt not flushing
erts: Make erlang:halt/0,1 close ports and flush async threads
erts: Remove forgotten and unused function erl_exit0
erts: Implement erl_halt
erts: Remove unused ntbuild.erl
Diffstat (limited to 'lib/stdlib/src/erl_internal.erl')
| -rw-r--r-- | lib/stdlib/src/erl_internal.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl index cd3b531d10..3063881890 100644 --- a/lib/stdlib/src/erl_internal.erl +++ b/lib/stdlib/src/erl_internal.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2011. All Rights Reserved. +%% Copyright Ericsson AB 1998-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -287,6 +287,7 @@ bif(group_leader, 0) -> true; bif(group_leader, 2) -> true; bif(halt, 0) -> true; bif(halt, 1) -> true; +bif(halt, 2) -> true; bif(hd, 1) -> true; bif(integer_to_list, 1) -> true; bif(integer_to_list, 2) -> true; |