From: Victor Stinner Date: Tue, 10 Nov 2015 11:11:52 +0000 (+0100) Subject: Merge 3.5 (pytime) X-Git-Tag: v3.6.0a1~1089 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0a0afdf70ecb1c104d5a802d74d00aaed6508d1;p=python Merge 3.5 (pytime) --- e0a0afdf70ecb1c104d5a802d74d00aaed6508d1 diff --cc Python/pytime.c index 8a6cb551f0,7f65824b47..81682caa96 --- a/Python/pytime.c +++ b/Python/pytime.c @@@ -639,9 -554,10 +639,9 @@@ _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 pymonotonic(_PyTime_t *tp, _Py_clock_info_t *info, int raise) {