From: Serhiy Storchaka Date: Wed, 18 Sep 2024 06:29:24 +0000 (+0300) Subject: Revert "gh-123974: Fix time.get_clock_info() on NetBSD (#123975)" (GH-124115) X-Git-Tag: v3.14.0a1~446 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79a74102362996bbd4ff5d410a0d57d43c236da4;p=thirdparty%2FPython%2Fcpython.git Revert "gh-123974: Fix time.get_clock_info() on NetBSD (#123975)" (GH-124115) This reverts commit b1d6f8a2ee04215c64aa8752cc515b7e98a08d28. --- diff --git a/Modules/timemodule.c b/Modules/timemodule.c index cfbb26b02595..46f85bc9c30f 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -1509,19 +1509,15 @@ _PyTime_GetThreadTimeWithInfo(PyTime_t *tp, _Py_clock_info_t *info) return -1; } if (info) { + struct timespec res; info->implementation = function; info->monotonic = 1; info->adjustable = 0; - #if defined(__NetBSD__) - info->resolution = 1e-9; - #else - struct timespec res; if (clock_getres(clk_id, &res)) { PyErr_SetFromErrno(PyExc_OSError); return -1; } info->resolution = res.tv_sec + res.tv_nsec * 1e-9; - #endif } if (_PyTime_FromTimespec(tp, &ts) < 0) {