aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/bif.tab
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-09-08 16:36:26 +0200
committerHenrik Nord <[email protected]>2011-09-08 16:36:26 +0200
commitf602ae4f0c727c1ff37e69887ba33f46b24c54e1 (patch)
tree340525e4b69e6971854de896b4f64d70b2224b0a /erts/emulator/beam/bif.tab
parent6fae573fc291f4a77282b918cae346064bece80e (diff)
parent262a9af33d3ceb4cb032c434b100cea7d4b0d60e (diff)
downloadotp-f602ae4f0c727c1ff37e69887ba33f46b24c54e1.tar.gz
otp-f602ae4f0c727c1ff37e69887ba33f46b24c54e1.tar.bz2
otp-f602ae4f0c727c1ff37e69887ba33f46b24c54e1.zip
Merge branch 'dev' into major
Diffstat (limited to 'erts/emulator/beam/bif.tab')
-rw-r--r--erts/emulator/beam/bif.tab2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index b171e99e03..831c0b1ce6 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -87,6 +87,8 @@ bif erlang:exit/2
bif 'erl.lang.proc':signal/2 ebif_signal_2 exit_2
bif erlang:external_size/1
bif 'erl.lang.term':external_size/1 ebif_external_size_1
+bif erlang:external_size/2
+bif 'erl.lang.term':external_size/2 ebif_external_size_2
ubif erlang:float/1
ubif 'erl.lang.number':to_float/1 ebif_to_float_1 float_1
bif erlang:float_to_list/1