diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-09-30 22:50:12 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-09-30 22:50:12 +0200 |
| commit | 5a6aa0da055b939140518cdcf2f187de533e3456 (patch) | |
| tree | 75091e3126ea80728183b4c0f67a6750bf058ace /Python/pytime.c | |
| parent | 827ad7f35c0b864086cd74d27be8b549d506d7d9 (diff) | |
| download | cpython-5a6aa0da055b939140518cdcf2f187de533e3456.tar.gz | |
Backout change 28d3bcb1bad6: "Try to fix _PyTime_AsTimevalStruct_impl() on
OpenBSD", I'm not sure that the change was really needed. I read the test
result of an old build because the OpenBSD was 100 builds late.
Diffstat (limited to 'Python/pytime.c')
| -rw-r--r-- | Python/pytime.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Python/pytime.c b/Python/pytime.c index 53611b1ec1..9889a3b53b 100644 --- a/Python/pytime.c +++ b/Python/pytime.c @@ -454,7 +454,7 @@ static int _PyTime_AsTimevalStruct_impl(_PyTime_t t, struct timeval *tv, _PyTime_round_t round, int raise) { - _PyTime_t secs, secs2; + _PyTime_t secs; int us; int res; @@ -467,8 +467,7 @@ _PyTime_AsTimevalStruct_impl(_PyTime_t t, struct timeval *tv, #endif tv->tv_usec = us; - secs2 = (_PyTime_t)tv->tv_sec; - if (res < 0 || secs2 != secs) { + if (res < 0 || (_PyTime_t)tv->tv_sec != secs) { if (raise) error_time_t_overflow(); return -1; |