diff options
| author | Brett Cannon <brett@python.org> | 2012-06-15 23:04:29 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2012-06-15 23:04:29 (GMT) |
| commit | 24aa693c7ef8f217fbd238eb7af7d828e13a07eb (patch) | |
| tree | 7d01ab630c2e8eef1e168b1aa5d84131b60cfd50 /Python | |
| parent | 99d776fdf4aa5a66266ebcec2263fab501f03088 (diff) | |
| parent | 016ef551a793f72f582d707ce5bb55bf4940cf27 (diff) | |
| download | cpython-24aa693c7ef8f217fbd238eb7af7d828e13a07eb.zip cpython-24aa693c7ef8f217fbd238eb7af7d828e13a07eb.tar.gz cpython-24aa693c7ef8f217fbd238eb7af7d828e13a07eb.tar.bz2 | |
Merge
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pytime.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Python/pytime.c b/Python/pytime.c index eb5685b..beeab87 100644 --- a/Python/pytime.c +++ b/Python/pytime.c @@ -44,10 +44,7 @@ pygettimeofday(_PyTime_timeval *tp, _Py_clock_info_t *info) (void) GetSystemTimeAdjustment(&timeAdjustment, &timeIncrement, &isTimeAdjustmentDisabled); info->resolution = timeIncrement * 1e-7; - if (isTimeAdjustmentDisabled) - info->adjusted = 0; - else - info->adjusted = 1; + info->adjustable = 1; } #else /* There are three ways to get the time: @@ -71,7 +68,7 @@ pygettimeofday(_PyTime_timeval *tp, _Py_clock_info_t *info) info->implementation = "gettimeofday()"; info->resolution = 1e-6; info->monotonic = 0; - info->adjusted = 1; + info->adjustable = 1; } return; } @@ -87,7 +84,7 @@ pygettimeofday(_PyTime_timeval *tp, _Py_clock_info_t *info) info->implementation = "ftime()"; info->resolution = 1e-3; info->monotonic = 0; - info->adjusted = 1; + info->adjustable = 1; } } #else /* !HAVE_FTIME */ @@ -97,7 +94,7 @@ pygettimeofday(_PyTime_timeval *tp, _Py_clock_info_t *info) info->implementation = "time()"; info->resolution = 1.0; info->monotonic = 0; - info->adjusted = 1; + info->adjustable = 1; } #endif /* !HAVE_FTIME */ |