From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 18 Sep 2024 06:47:17 +0000 (+0200)
Subject: [3.12] Revert "gh-123974: Fix time.get_clock_info() on NetBSD (GH-123975)" (GH-124115... 
X-Git-Tag: v3.12.7~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=708173c35e5a51a6aa7e4d0647cbcbfc9adab1ed;p=thirdparty%2FPython%2Fcpython.git

[3.12] Revert "gh-123974: Fix time.get_clock_info() on NetBSD (GH-123975)" (GH-124115) (GH-124200)

This reverts commit b1d6f8a2ee04215c64aa8752cc515b7e98a08d28.
(cherry picked from commit 79a74102362996bbd4ff5d410a0d57d43c236da4)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 124efc8364bf..8613fccfe022 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -1525,19 +1525,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) {