Merge 3.5 (pytime)

vstinner · vstinner · commit e0a0afdf70ec · 2015-11-10T12:11:52.000+01:00
diff --git a/Python/pytime.c b/Python/pytime.c
@@ -534,7 +534,7 @@ _PyTime_AsTimespec(_PyTime_t t, struct timespec *ts)
 #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_t
 _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 @@ _PyTime_GetSystemClock(void)
 int
 _PyTime_GetSystemClockWithInfo(_PyTime_t *t, _Py_clock_info_t *info)
 {
-    return pygettimeofday_new(t, info, 1);
+    return pygettimeofday(t, info, 1);
 }
 
 static int

Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,7 @@ _PyTime_AsTimespec(_PyTime_t t, struct timespec *ts)`
`534`	`534`	`#endif`
`535`	`535`
`536`	`536`	`static int`
`537`		`-pygettimeofday_new(_PyTime_t tp, _Py_clock_info_t info, int raise)`
	`537`	`+pygettimeofday(_PyTime_t tp, _Py_clock_info_t info, int raise)`
`538`	`538`	`{`
`539`	`539`	`#ifdef MS_WINDOWS`
`540`	`540`	`FILETIME system_time;`
`@@ -626,7 +626,7 @@ _PyTime_t`
`626`	`626`	`_PyTime_GetSystemClock(void)`
`627`	`627`	`{`
`628`	`628`	`_PyTime_t t;`
`629`		`- if (pygettimeofday_new(&t, NULL, 0) < 0) {`
	`629`	`+ if (pygettimeofday(&t, NULL, 0) < 0) {`
`630`	`630`	`/* should not happen, _PyTime_Init() checked the clock at startup */`
`631`	`631`	`assert(0);`
`632`	`632`
`@@ -639,7 +639,7 @@ _PyTime_GetSystemClock(void)`
`639`	`639`	`int`
`640`	`640`	`_PyTime_GetSystemClockWithInfo(_PyTime_t t, _Py_clock_info_t info)`
`641`	`641`	`{`
`642`		`- return pygettimeofday_new(t, info, 1);`
	`642`	`+ return pygettimeofday(t, info, 1);`
`643`	`643`	`}`
`644`	`644`
`645`	`645`	`static int`