From 002aef3f66a9f8da635e20860622f2e539a0b611 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sat, 20 Oct 2018 17:41:38 -0700 Subject: [PATCH] closes bpo-35025: Properly guard the `CLOCK_GETTIME` et al macros in timemodule.c. (GH-9961) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Guard the `CLOCK_GETTIME` et al macros in `timemodule` based on the availability of the parent functions (cherry picked from commit 94451182ccd6729c11338926d8a3d11645e86626) Co-authored-by: Max Bélanger --- .../next/macOS/2018-10-18-23-54-55.bpo-35025.X4LFJg.rst | 2 ++ Modules/timemodule.c | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 Misc/NEWS.d/next/macOS/2018-10-18-23-54-55.bpo-35025.X4LFJg.rst 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 000000000000..aebd1af9351c --- /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 7264ad616700..cd287f595b14 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -1700,6 +1700,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 @@ -1728,6 +1730,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) -- 2.47.3