[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (pytime)

Tue Nov 10 06:12:37 EST 2015

https://hg.python.org/cpython/rev/4c903ceeb4d1
changeset: 99041:4c903ceeb4d1
parent: 99039:5da42b87e660
parent: 99040:330cec28f6ff
user: Victor Stinner <victor.stinner at gmail.com>
date: Tue Nov 10 12:11:52 2015 +0100
summary:
 Merge 3.5 (pytime)
files:
 Python/pytime.c | 6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Python/pytime.c b/Python/pytime.c
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -534,7 +534,7 @@
 #endif
 
 static int
-pygettimeofday_new(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
+pygettimeofday(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
 {
 #ifdef MS_WINDOWS
 FILETIME system_time;
@@ -626,7 +626,7 @@
 _PyTime_GetSystemClock(void)
 {
 _PyTime_t t;
- if (pygettimeofday_new(&t, NULL, 0) < 0) {
+ if (pygettimeofday(&t, NULL, 0) < 0) {
 /* should not happen, _PyTime_Init() checked the clock at startup */
 assert(0);
 
@@ -639,7 +639,7 @@
 int
 _PyTime_GetSystemClockWithInfo(_PyTime_t *t, _Py_clock_info_t *info)
 {
- return pygettimeofday_new(t, info, 1);
+ return pygettimeofday(t, info, 1);
 }
 
 static int
-- 
Repository URL: https://hg.python.org/cpython
