diff options
| author | Björn-Egil Dahlberg <egil@erlang.org> | 2011-12-09 16:41:49 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <egil@erlang.org> | 2011-12-09 16:41:49 +0100 |
| commit | 2f15e7e066b0b83e357a55680538e75e2c16e43e (patch) | |
| tree | 47eb2b8f45062a41b0051f05f2584d9afa6d12de /bootstrap/lib/kernel/include | |
| parent | 984f4e1c21f2c9f4a03024d36afd393515276a65 (diff) | |
| download | erlang-2f15e7e066b0b83e357a55680538e75e2c16e43e.tar.gz | |
Update primary bootstrap
Diffstat (limited to 'bootstrap/lib/kernel/include')
| -rw-r--r-- | bootstrap/lib/kernel/include/dist.hrl | 2 | ||||
| -rw-r--r-- | bootstrap/lib/kernel/include/dist_util.hrl | 2 | ||||
| -rw-r--r-- | bootstrap/lib/kernel/include/file.hrl | 11 | ||||
| -rw-r--r-- | bootstrap/lib/kernel/include/net_address.hrl | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/bootstrap/lib/kernel/include/dist.hrl b/bootstrap/lib/kernel/include/dist.hrl index aea1ab81ba..5b52f6f294 100644 --- a/bootstrap/lib/kernel/include/dist.hrl +++ b/bootstrap/lib/kernel/include/dist.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. +%% Copyright Ericsson AB 1999-2011. 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 diff --git a/bootstrap/lib/kernel/include/dist_util.hrl b/bootstrap/lib/kernel/include/dist_util.hrl index f2b0598532..c3a7f97418 100644 --- a/bootstrap/lib/kernel/include/dist_util.hrl +++ b/bootstrap/lib/kernel/include/dist_util.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. +%% Copyright Ericsson AB 1999-2011. 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 diff --git a/bootstrap/lib/kernel/include/file.hrl b/bootstrap/lib/kernel/include/file.hrl index 3889bce393..bf97173122 100644 --- a/bootstrap/lib/kernel/include/file.hrl +++ b/bootstrap/lib/kernel/include/file.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2010. All Rights Reserved. +%% Copyright Ericsson AB 1997-2011. 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 @@ -25,10 +25,11 @@ {size :: non_neg_integer(), % Size of file in bytes. type :: 'device' | 'directory' | 'other' | 'regular' | 'symlink', access :: 'read' | 'write' | 'read_write' | 'none', - atime :: file:date_time(), % The local time the file was last read: - % {{Year, Mon, Day}, {Hour, Min, Sec}}. - mtime :: file:date_time(), % The local time the file was last written. - ctime :: file:date_time(), % The interpretation of this time field + atime :: file:date_time() | integer(), % The local time the file was last read: + % {{Year, Mon, Day}, {Hour, Min, Sec}}. + % atime, ctime, mtime may also be unix epochs() + mtime :: file:date_time() | integer(), % The local time the file was last written. + ctime :: file:date_time() | integer(), % The interpretation of this time field % is dependent on operating system. % On Unix it is the last time the file % or the inode was changed. On Windows, diff --git a/bootstrap/lib/kernel/include/net_address.hrl b/bootstrap/lib/kernel/include/net_address.hrl index 5342076507..9b9ea42931 100644 --- a/bootstrap/lib/kernel/include/net_address.hrl +++ b/bootstrap/lib/kernel/include/net_address.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2009. All Rights Reserved. +%% Copyright Ericsson AB 1997-2011. 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 |