From: Alexey Izbyshev <izbyshev@ispras.ru>
Date: Fri, 2 Nov 2018 16:32:26 +0000 (+0300)
Subject: bpo-35147: Fix _Py_NO_RETURN for GCC (GH-10300)
X-Git-Tag: v3.8.0a1~592
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2ed5adcb5db2d70cfa72da1ba8446f7aa9e05cd;p=python

bpo-35147: Fix _Py_NO_RETURN for GCC (GH-10300)



Use `__GNUC__` instead of non-existing `__GNUC_MAJOR__`.





https://bugs.python.org/issue35147
---

diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index 4e2995469f..808e0def06 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -94,9 +94,9 @@ PyAPI_FUNC(void) PyErr_SetExcInfo(PyObject *, PyObject *, PyObject *);
 #endif
 
 #if defined(__clang__) || \
-    (defined(__GNUC_MAJOR__) && \
-     ((__GNUC_MAJOR__ >= 3) || \
-      (__GNUC_MAJOR__ == 2) && (__GNUC_MINOR__ >= 5)))
+    (defined(__GNUC__) && \
+     ((__GNUC__ >= 3) || \
+      (__GNUC__ == 2) && (__GNUC_MINOR__ >= 5)))
 #  define _Py_NO_RETURN __attribute__((__noreturn__))
 #elif defined(_MSC_VER)
 #  define _Py_NO_RETURN __declspec(noreturn)