From: haney <david.haney@gmail.com>
Date: Wed, 21 Jun 2017 18:18:21 +0000 (-0700)
Subject: bpo-30183: Fixes HP-UX cc compilation error in pytime.c (#1351)
X-Git-Tag: v3.7.0a1~552
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c90e96015085784df86632b26059b19c80cbfc97;p=thirdparty%2FPython%2Fcpython.git

bpo-30183: Fixes HP-UX cc compilation error in pytime.c (#1351)

* 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
---

diff --git a/Python/pytime.c b/Python/pytime.c
index 3015a6be0b83..8979adc21912 100644
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -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