aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/bif.tab
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2012-03-19 10:55:31 +0100
committerRaimo Niskanen <[email protected]>2012-03-21 11:00:49 +0100
commitb80ee2bbf4c2c28ceeb3e561fddc9020c686071f (patch)
treea78f54a1336018a624d04dc2ea62fabedbe99f93 /erts/emulator/beam/bif.tab
parent83d38d0dda488ecb7090f3070a5b2569be5a555e (diff)
downloadotp-b80ee2bbf4c2c28ceeb3e561fddc9020c686071f.tar.gz
otp-b80ee2bbf4c2c28ceeb3e561fddc9020c686071f.tar.bz2
otp-b80ee2bbf4c2c28ceeb3e561fddc9020c686071f.zip
erts: Implement erlang:halt/2
Diffstat (limited to 'erts/emulator/beam/bif.tab')
-rw-r--r--erts/emulator/beam/bif.tab4
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 8cc568b16c..007c884a6a 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 1996-2011. All Rights Reserved.
+# Copyright Ericsson AB 1996-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
@@ -115,6 +115,8 @@ bif erlang:halt/0
bif 'erl.lang.system':halt/0 ebif_halt_0
bif erlang:halt/1
bif 'erl.lang.system':halt/1 ebif_halt_1
+bif erlang:halt/2
+bif 'erl.lang.system':halt/2 ebif_halt_2
bif erlang:phash/2
bif erlang:phash2/1
bif erlang:phash2/2