diff options
| author | Lars Thorsen <[email protected]> | 2015-05-08 12:41:17 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2015-05-08 12:41:17 +0200 |
| commit | 4c1326cff025c3757260063ce2ebac7ab2d76378 (patch) | |
| tree | 3ceb52fc14d5211b2b78786d2e2117f6942f2491 /lib/cosTime/src/cosTimeApp.hrl | |
| parent | 2e90dc9905de1e2817377fc2cfbd712ad8c802d0 (diff) | |
| parent | 2a2d6181184ccde3bc929981eeee662203142238 (diff) | |
| download | otp-4c1326cff025c3757260063ce2ebac7ab2d76378.tar.gz otp-4c1326cff025c3757260063ce2ebac7ab2d76378.tar.bz2 otp-4c1326cff025c3757260063ce2ebac7ab2d76378.zip | |
Merge branch 'lars/remove_now/OTP-12687'
* lars/remove_now/OTP-12687:
[orber, cos*] Remove usage of erlang:now() in test suites
[orber] Use rand instead of random
[orber, cos*] Bump versions and update dependencies in app file
[orber, cos*] Remove usage of erlang:now()
Diffstat (limited to 'lib/cosTime/src/cosTimeApp.hrl')
| -rw-r--r-- | lib/cosTime/src/cosTimeApp.hrl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cosTime/src/cosTimeApp.hrl b/lib/cosTime/src/cosTimeApp.hrl index f3082816f7..bdf0bf7278 100644 --- a/lib/cosTime/src/cosTimeApp.hrl +++ b/lib/cosTime/src/cosTimeApp.hrl @@ -41,7 +41,7 @@ -define(max_TimeT, 18446744073709551616). %% The calendar module uses year 0 as base for gregorian functions. -%% 'ABSOULTE_TIME_DIFF' is #seconfs from year 0 until 15 october 1582, 00:00. +%% 'ABSOULTE_TIME_DIFF' is #seconds from year 0 until 15 october 1582, 00:00. -define(ABSOLUTE_TIME_DIFF, 49947926400). %% As above but diff year 0 to 00:00 GMT, January 1, 1970 -define(STANDARD_TIME_DIFF, 62167219200). |