]> granicus.if.org Git - python/commitdiff
closes bpo-35025: Properly guard the `CLOCK_GETTIME` et al macros in timemodule.c...
authorMax Bélanger <aeromax@gmail.com>
Sun, 21 Oct 2018 00:07:54 +0000 (17:07 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 21 Oct 2018 00:07:54 +0000 (17:07 -0700)
Guard the `CLOCK_GETTIME` et al macros in `timemodule` based on the availability of the parent functions

Misc/NEWS.d/next/macOS/2018-10-18-23-54-55.bpo-35025.X4LFJg.rst [new file with mode: 0644]
Modules/timemodule.c

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 (file)
index 0000000..aebd1af
--- /dev/null
@@ -0,0 +1,2 @@
+Properly guard the use of the ``CLOCK_GETTIME`` et al. macros in ``timemodule``
+on macOS.
index f41d6fab95ba4b48660b5405ab2ce998067f8ec3..01eb9f69c4a729a399a4f38aaeebb41f959d0ba2 100644 (file)
@@ -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)