[Python-checkins] cpython: Backout change 28d3bcb1bad6: "Try to fix _PyTime_AsTimevalStruct_impl() on

Wed Sep 30 23:01:00 CEST 2015

https://hg.python.org/cpython/rev/4bbe95f0a57b
changeset: 98442:4bbe95f0a57b
user: Victor Stinner <victor.stinner at gmail.com>
date: Wed Sep 30 22:50:12 2015 +0200
summary:
 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.
files:
 Python/pytime.c | 5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Python/pytime.c b/Python/pytime.c
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -454,7 +454,7 @@
 _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 @@
 #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;
-- 
Repository URL: https://hg.python.org/cpython
