]> granicus.if.org Git - python/commitdiff
bpo-30183: Fixes HP-UX cc compilation error in pytime.c (#1351)
authorhaney <david.haney@gmail.com>
Wed, 21 Jun 2017 18:18:21 +0000 (11:18 -0700)
committerVictor Stinner <victor.stinner@gmail.com>
Wed, 21 Jun 2017 18:18:21 +0000 (20:18 +0200)
* bpo-30183: Fixes HP-UX cc compilation error in pytime.c

HP-UX does not support the CLOCK_MONOTONIC identifier, and will fail to
compile:

    "Python/pytime.c", line 723: error #2020: identifier
    "CLOCK_MONOTONIC" is undefined
          const clockid_t clk_id = CLOCK_MONOTONIC;

Add a new section for __hpux that calls 'gethrtime()' instead of
'clock_gettime()'.

* bpo-30183: Removes unnecessary return

Python/pytime.c

index 3015a6be0b83c1c173b32d85b5ac8bd9961cd278..8979adc2191267f59e334051c5c5e6752f0e9be0 100644 (file)
@@ -693,6 +693,26 @@ pymonotonic(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
         info->adjustable = 0;
     }
 
+#elif defined(__hpux)
+    hrtime_t time;
+
+    time = gethrtime();
+    if (time == -1) {
+        if (raise) {
+            PyErr_SetFromErrno(PyExc_OSError);
+        }
+        return -1;
+    }
+
+    *tp = time;
+
+    if (info) {
+        info->implementation = "gethrtime()";
+        info->resolution = 1e-9;
+        info->monotonic = 1;
+        info->adjustable = 0;
+    }
+
 #else
     struct timespec ts;
 #ifdef CLOCK_HIGHRES