diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-11-10 11:11:52 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-11-10 11:11:52 (GMT) |
| commit | e0a0afdf70ecb1c104d5a802d74d00aaed6508d1 (patch) | |
| tree | 4f6fb94326816a3ea3ab61e987cebecc7798a752 /Python/pytime.c | |
| parent | 349718a20a664e5aaa1e6cbd5ea9c33bbe4fac5c (diff) | |
| parent | c379ade1bb0cd1636050d5576a9db1030c136a55 (diff) | |
| download | cpython-e0a0afdf70ecb1c104d5a802d74d00aaed6508d1.zip cpython-e0a0afdf70ecb1c104d5a802d74d00aaed6508d1.tar.gz cpython-e0a0afdf70ecb1c104d5a802d74d00aaed6508d1.tar.bz2 | |
Merge 3.5 (pytime)
Diffstat (limited to 'Python/pytime.c')
| -rw-r--r-- | Python/pytime.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/pytime.c b/Python/pytime.c index 8a6cb55..81682ca 100644 --- 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 |