summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Root <jmr@macports.org>2021-01-04 10:36:58 (GMT)
committerGitHub <noreply@github.com>2021-01-04 10:36:58 (GMT)
commitdf21f502fdccec234282bf0a211af979fd23def4 (patch)
tree60af144fe8a558722a779bc8ed4ef06ca0dab876
parentb6fc0c406e6b4b86f59b1390142f35da0e364927 (diff)
downloadcpython-df21f502fdccec234282bf0a211af979fd23def4.zip
cpython-df21f502fdccec234282bf0a211af979fd23def4.tar.gz
cpython-df21f502fdccec234282bf0a211af979fd23def4.tar.bz2
bpo-42692: fix __builtin_available check on older compilers (GH-23873)
A compiler that doesn't define `__has_builtin` will error out when it is used on the same line as the check for it. Automerge-Triggered-By: GH:ronaldoussoren
-rw-r--r--Misc/NEWS.d/next/Build/2021-01-04-05-07-30.bpo-42692.OO11SN.rst1
-rw-r--r--Modules/posixmodule.c8
2 files changed, 8 insertions, 1 deletions
diff --git a/Misc/NEWS.d/next/Build/2021-01-04-05-07-30.bpo-42692.OO11SN.rst b/Misc/NEWS.d/next/Build/2021-01-04-05-07-30.bpo-42692.OO11SN.rst
new file mode 100644
index 0000000..91582b9
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2021-01-04-05-07-30.bpo-42692.OO11SN.rst
@@ -0,0 +1 @@
+Fix __builtin_available check on older compilers. Patch by Joshua Root.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 13e3963..4468fd0 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -61,7 +61,13 @@
*/
#if defined(__APPLE__)
-#if defined(__has_builtin) && __has_builtin(__builtin_available)
+#if defined(__has_builtin)
+#if __has_builtin(__builtin_available)
+#define HAVE_BUILTIN_AVAILABLE 1
+#endif
+#endif
+
+#ifdef HAVE_BUILTIN_AVAILABLE
# define HAVE_FSTATAT_RUNTIME __builtin_available(macOS 10.10, iOS 8.0, *)
# define HAVE_FACCESSAT_RUNTIME __builtin_available(macOS 10.10, iOS 8.0, *)
# define HAVE_FCHMODAT_RUNTIME __builtin_available(macOS 10.10, iOS 8.0, *)