aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-12-07 16:08:55 +0100
committerBjörn-Egil Dahlberg <[email protected]>2011-12-08 14:12:03 +0100
commit9baa361811a4dd936e73136ea20320423980604b (patch)
tree4d01bafcdd70d7f1fedb1cfe2745559f0988cc11 /erts/preloaded/src
parenta37f854be3aaee3786d555a28bb4c8d53384a852 (diff)
downloadotp-9baa361811a4dd936e73136ea20320423980604b.tar.gz
otp-9baa361811a4dd936e73136ea20320423980604b.tar.bz2
otp-9baa361811a4dd936e73136ea20320423980604b.zip
Change name of bif universaltime_to_seconds/1
* erlang:universaltime_to_seconds/1 changed to erlang:universaltime_to_posixtime/1 * erlang:seconds_to_universaltime/1 changed to erlang:posixtime_to_universaltime/1 Let prim_file.erl reflect these changes.
Diffstat (limited to 'erts/preloaded/src')
-rw-r--r--erts/preloaded/src/prim_file.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index e5cb1d5c03..36cbe329e8 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -812,7 +812,7 @@ write_file_info_int(Port, File,
file_info_validate_atime(Atime, _) when Atime =/= undefined -> Atime;
file_info_validate_atime(undefined, local) -> erlang:localtime();
file_info_validate_atime(undefined, universal) -> erlang:universaltime();
-file_info_validate_atime(undefined, posix) -> erlang:universaltime_to_seconds((erlang:universaltime())).
+file_info_validate_atime(undefined, posix) -> erlang:universaltime_to_posixtime(erlang:universaltime()).
file_info_validate_mtime(undefined, Atime) -> Atime;
file_info_validate_mtime(Mtime, _) -> Mtime.
@@ -1349,13 +1349,13 @@ plgv(_, [], D) -> D.
from_seconds(Seconds, posix) when is_integer(Seconds) ->
Seconds;
from_seconds(Seconds, universal) when is_integer(Seconds) ->
- erlang:seconds_to_universaltime(Seconds);
+ erlang:posixtime_to_universaltime(Seconds);
from_seconds(Seconds, local) when is_integer(Seconds) ->
- erlang:universaltime_to_localtime(erlang:seconds_to_universaltime(Seconds)).
+ erlang:universaltime_to_localtime(erlang:posixtime_to_universaltime(Seconds)).
to_seconds(Seconds, posix) when is_integer(Seconds) ->
Seconds;
to_seconds({_,_} = Datetime, universal) ->
- erlang:universaltime_to_seconds(Datetime);
+ erlang:universaltime_to_posixtime(Datetime);
to_seconds({_,_} = Datetime, local) ->
- erlang:universaltime_to_seconds(erlang:localtime_to_universaltime(Datetime)).
+ erlang:universaltime_to_posixtime(erlang:localtime_to_universaltime(Datetime)).