traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3.5 (pytime)

This commit is contained in:
Victor Stinner 2015-11-10 12:11:52 +01:00
parent 349718a20a c379ade1bb
commit e0a0afdf70
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Python/pytime.c
View File

@ -534,7 +534,7 @@ _PyTime_AsTimespec(_PyTime_t t, struct timespec *ts)
#endif #endif
static int 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 #ifdef MS_WINDOWS
FILETIME system_time; FILETIME system_time;
@ -626,7 +626,7 @@ _PyTime_t
_PyTime_GetSystemClock(void) _PyTime_GetSystemClock(void)
{ {
_PyTime_t t; _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 */ /* should not happen, _PyTime_Init() checked the clock at startup */
assert(0); assert(0);
@ -639,7 +639,7 @@ _PyTime_GetSystemClock(void)
int int
_PyTime_GetSystemClockWithInfo(_PyTime_t *t, _Py_clock_info_t *info) _PyTime_GetSystemClockWithInfo(_PyTime_t *t, _Py_clock_info_t *info)
{ {
return pygettimeofday_new(t, info, 1); return pygettimeofday(t, info, 1);
} }
static int static int