Fix double redeclaration on MSVC+clang-cl

python · Fidget-Spinner · Apr 5, 2025 · Apr 4, 2025 · Apr 4, 2025 · Apr 4, 2025
commit 701aa8df68e62b3189c8aa1139a66490c8fe814a
diff --git a/Include/internal/pycore_debug_offsets.h b/Include/internal/pycore_debug_offsets.h
@@ -17,13 +17,21 @@ extern "C" {
 
 // Macros to burn global values in custom sections so out-of-process
 // profilers can locate them easily.
-#define GENERATE_DEBUG_SECTION(name, declaration)     \
-   _GENERATE_DEBUG_SECTION_WINDOWS(name)            \
-   _GENERATE_DEBUG_SECTION_APPLE(name)              \
-   declaration                                      \
-   _GENERATE_DEBUG_SECTION_LINUX(name)
 
-#if defined(MS_WINDOWS) && !defined(__clang__)
+// MSVC+Clang has a bug where it declares it twice.
+#if defined(MS_WINDOWS) && defined(__clang__)
+#   define GENERATE_DEBUG_SECTION(name, declaration)     \
+        _GENERATE_DEBUG_SECTION_WINDOWS(name)
+#else
+// Everything else
+#   define GENERATE_DEBUG_SECTION(name, declaration)     \
+        _GENERATE_DEBUG_SECTION_WINDOWS(name)            \
+        _GENERATE_DEBUG_SECTION_APPLE(name)              \
+        declaration                                      \
+        _GENERATE_DEBUG_SECTION_LINUX(name)
+#endif
+
+#if defined(MS_WINDOWS)
 #define _GENERATE_DEBUG_SECTION_WINDOWS(name)                       \
    _Pragma(Py_STRINGIFY(section(Py_STRINGIFY(name), read, write))) \
    __declspec(allocate(Py_STRINGIFY(name)))