From: Max Bélanger <aeromax@gmail.com>
Date: Sun, 21 Oct 2018 00:07:54 +0000 (-0700)
Subject: closes bpo-35025: Properly guard the `CLOCK_GETTIME` et al macros in timemodule.c... 
X-Git-Tag: v3.8.0a1~714
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94451182ccd6729c11338926d8a3d11645e86626;p=python

closes bpo-35025: Properly guard the `CLOCK_GETTIME` et al macros in timemodule.c. (GH-9961)

Guard the `CLOCK_GETTIME` et al macros in `timemodule` based on the availability of the parent functions
---

diff --git a/Misc/NEWS.d/next/macOS/2018-10-18-23-54-55.bpo-35025.X4LFJg.rst b/Misc/NEWS.d/next/macOS/2018-10-18-23-54-55.bpo-35025.X4LFJg.rst
new file mode 100644
index 0000000000..aebd1af935
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2018-10-18-23-54-55.bpo-35025.X4LFJg.rst
@@ -0,0 +1,2 @@
+Properly guard the use of the ``CLOCK_GETTIME`` et al. macros in ``timemodule``
+on macOS.
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index f41d6fab95..01eb9f69c4 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -1723,6 +1723,8 @@ PyInit_time(void)
     /* Set, or reset, module variables like time.timezone */
     PyInit_timezone(m);
 
+#if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_CLOCK_SETTIME) || defined(HAVE_CLOCK_GETRES)
+
 #ifdef CLOCK_REALTIME
     PyModule_AddIntMacro(m, CLOCK_REALTIME);
 #endif
@@ -1751,6 +1753,8 @@ PyInit_time(void)
     PyModule_AddIntMacro(m, CLOCK_UPTIME);
 #endif
 
+#endif  /* defined(HAVE_CLOCK_GETTIME) || defined(HAVE_CLOCK_SETTIME) || defined(HAVE_CLOCK_GETRES) */
+
     if (!initialized) {
         if (PyStructSequence_InitType2(&StructTimeType,
                                        &struct_time_type_desc) < 0)