From a0b8b342c5d0b4722ad9cfe82f2630025d445f00 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 1 Jul 2024 10:49:33 +0200 Subject: [PATCH] gh-121199: Use _Py__has_attribute() in timemodule.c (#121203) Use the _Py__has_attribute() macro in timemodule.c and bootstrap_hash.c to fix a build error on old GCC versions (GCC 4.8.5 on s390x). --- Modules/timemodule.c | 2 +- Python/bootstrap_hash.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/timemodule.c b/Modules/timemodule.c index ed2d32688ec..4b10730436c 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -1488,7 +1488,7 @@ _PyTime_GetThreadTimeWithInfo(PyTime_t *tp, _Py_clock_info_t *info) !defined(__EMSCRIPTEN__) && !defined(__wasi__) #define HAVE_THREAD_TIME -#if defined(__APPLE__) && defined(__has_attribute) && __has_attribute(availability) +#if defined(__APPLE__) && _Py__has_attribute(availability) static int _PyTime_GetThreadTimeWithInfo(PyTime_t *tp, _Py_clock_info_t *info) __attribute__((availability(macos, introduced=10.12))) diff --git a/Python/bootstrap_hash.c b/Python/bootstrap_hash.c index 92f2301a012..1dc5bffe1b0 100644 --- a/Python/bootstrap_hash.c +++ b/Python/bootstrap_hash.c @@ -199,7 +199,7 @@ py_getrandom(void *buffer, Py_ssize_t size, int blocking, int raise) getentropy() is retried if it failed with EINTR: interrupted by a signal. */ -#if defined(__APPLE__) && defined(__has_attribute) && __has_attribute(availability) +#if defined(__APPLE__) && _Py__has_attribute(availability) static int py_getentropy(char *buffer, Py_ssize_t size, int raise) __attribute__((availability(macos,introduced=10.12)))