aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2012-03-22 14:29:55 +0100
committerRaimo Niskanen <[email protected]>2012-03-22 15:41:18 +0100
commitf67487b67bfb9ab04b01ef87bbfc39a24f604f11 (patch)
tree3029c7a42a621670cdf4834a3712bca2f9376b9d /erts/preloaded
parent5d7ed57d07118f95cf970ee655ea8eea76cbe6fd (diff)
parent1e13b92d5c6543c82219610aa1336dbdf1f4dc2d (diff)
downloadotp-f67487b67bfb9ab04b01ef87bbfc39a24f604f11.tar.gz
otp-f67487b67bfb9ab04b01ef87bbfc39a24f604f11.tar.bz2
otp-f67487b67bfb9ab04b01ef87bbfc39a24f604f11.zip
Merge branch 'maint'
Conflicts: erts/doc/src/erlang.xml erts/emulator/beam/erl_process.c erts/emulator/beam/erl_process.h erts/emulator/test/bif_SUITE.erl erts/preloaded/ebin/erlang.beam erts/preloaded/src/erlang.erl lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/ebin/erlang.beambin87216 -> 87488 bytes
-rw-r--r--erts/preloaded/src/erlang.erl13
2 files changed, 11 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 1dce82f611..9b65302b6e 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
Binary files differ
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 5e451c015b..274764ac74 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -87,7 +87,7 @@
-export([garbage_collect/0, garbage_collect/1]).
-export([garbage_collect_message_area/0, get/0, get/1, get_keys/1]).
-export([get_module_info/1, get_stacktrace/0, group_leader/0]).
--export([group_leader/2, halt/0, halt/1, hash/2, hibernate/3]).
+-export([group_leader/2, halt/0, halt/1, halt/2, hash/2, hibernate/3]).
-export([integer_to_list/1, iolist_size/1, iolist_to_binary/1]).
-export([is_alive/0, is_builtin/3, is_process_alive/1, length/1, link/1]).
-export([list_to_atom/1, list_to_binary/1, list_to_bitstr/1]).
@@ -748,10 +748,19 @@ halt() ->
%% halt/1
%% Shadowed by erl_bif_types: erlang:halt/1
-spec halt(Status) -> no_return() when
- Status :: non_neg_integer() | string().
+ Status :: non_neg_integer() | 'abort' | string().
halt(_Status) ->
erlang:nif_error(undefined).
+%% halt/2
+%% Shadowed by erl_bif_types: erlang:halt/2
+-spec halt(Status, Options) -> no_return() when
+ Status :: non_neg_integer() | 'abort' | string(),
+ Options :: [Option],
+ Option :: {flush, boolean()}.
+halt(_Status, _Options) ->
+ erlang:nif_error(undefined).
+
%% hash/2
-spec erlang:hash(Term, Range) -> pos_integer() when
Term :: term(),