aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/bif.c4
-rw-r--r--erts/emulator/beam/bif.tab4
2 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 12dc7b3a48..55f4798892 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -3387,7 +3387,7 @@ BIF_RETTYPE universaltime_to_localtime_1(BIF_ALIST_1)
/* convert calendar:universaltime_to_seconds/1 */
-BIF_RETTYPE universaltime_to_seconds_1(BIF_ALIST_1)
+BIF_RETTYPE universaltime_to_posixtime_1(BIF_ALIST_1)
{
Sint year, month, day;
Sint hour, minute, second;
@@ -3411,7 +3411,7 @@ BIF_RETTYPE universaltime_to_seconds_1(BIF_ALIST_1)
/* convert calendar:seconds_to_universaltime/1 */
-BIF_RETTYPE seconds_to_universaltime_1(BIF_ALIST_1)
+BIF_RETTYPE posixtime_to_universaltime_1(BIF_ALIST_1)
{
Sint year, month, day;
Sint hour, minute, second;
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 0d6af46aa5..8cc568b16c 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -810,8 +810,8 @@ bif erlang:check_old_code/1
#
# New in R15B
#
-bif erlang:universaltime_to_seconds/1
-bif erlang:seconds_to_universaltime/1
+bif erlang:universaltime_to_posixtime/1
+bif erlang:posixtime_to_universaltime/1
#
# Obsolete
#