Use a private name for the macro

Author: encukou

Python/ceval.c

@@ -70,7 +70,7 @@ _Py_ReachedRecursionLimitWithMargin(PyThreadState *tstate, int margin_count)
 #  define Py_C_STACK_SIZE 4000000
 #endif
 
-#ifdef HAVE_UNRELIABLE_PTHREAD_GETATTR_NP
+#ifdef _Py_HAVE_UNRELIABLE_PTHREAD_GETATTR_NP
 #ifdef HAVE_SYS_RESOURCE_H
 #  include <sys/resource.h>
 #endif
@@ -119,7 +119,7 @@ hardware_stack_limits(uintptr_t *base, uintptr_t *top, uintptr_t sp)
         err |= pthread_attr_destroy(&attr);
     }
     if (err == 0) {
-#    ifdef HAVE_UNRELIABLE_PTHREAD_GETATTR_NP
+#    ifdef _Py_HAVE_UNRELIABLE_PTHREAD_GETATTR_NP
         /* pthread_getattr_np on the main thread of a musl process reports a
          * stack size based on the current stack rather than RLIMIT_STACK.
          * New threads are reported correctly even on musl, so this fallback

Tools/build/check_capi_macros_ignored.txt

@@ -608,7 +608,6 @@ HAVE_UNAME
 HAVE_UNISTD_H
 HAVE_UNLINKAT
 HAVE_UNLOCKPT
-HAVE_UNRELIABLE_PTHREAD_GETATTR_NP
 HAVE_UNSHARE
 HAVE_USABLE_WCHAR_T
 HAVE_UTIL_H

configure

@@ -5855,7 +5855,7 @@ int main(void) {
       [ac_cv_unreliable_pthread_getattr_np=yes],
       [ac_cv_unreliable_pthread_getattr_np=no])])
    AS_VAR_IF([ac_cv_unreliable_pthread_getattr_np], [yes],
-     [AC_DEFINE([HAVE_UNRELIABLE_PTHREAD_GETATTR_NP], [1],
+     [AC_DEFINE([_Py_HAVE_UNRELIABLE_PTHREAD_GETATTR_NP], [1],
        [Define if pthread_getattr_np under-reports the main thread's stack size (musl behaviour).])])])
 
 # os.statx uses Linux's statx function.  AIX also has a function named statx,

configure.ac

@@ -1654,10 +1654,6 @@
 /* Define to 1 if you have the 'unlockpt' function. */
 #undef HAVE_UNLOCKPT
 
-/* Define if pthread_getattr_np under-reports the main thread's stack size
-   (musl behaviour). */
-#undef HAVE_UNRELIABLE_PTHREAD_GETATTR_NP
-
 /* Define to 1 if you have the 'unshare' function. */
 #undef HAVE_UNSHARE
 
@@ -2178,6 +2174,10 @@
 /* Define if you have the 'tanpi' function. */
 #undef _Py_HAVE_TANPI
 
+/* Define if pthread_getattr_np under-reports the main thread's stack size
+   (musl behaviour). */
+#undef _Py_HAVE_UNRELIABLE_PTHREAD_GETATTR_NP
+
 /* Thread stack size set by the linker (in bytes). */
 #undef _Py_LINKER_THREAD_STACK_SIZE