commit a9122d183b1fbc4484d72aec69fc0979c7fd91f2
author Alexey Izbyshev <izbyshev@ispras.ru> Sat Nov 03 04:30:11 2018 +0300
committer Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Fri Nov 02 18:30:11 2018 -0700
tree 00d051bf88180fbd5db014edfd2e824c8415bedf
parent 08026b103ea8f4c9f2b5045ef7806dd8b760da2b

[3.7] bpo-35147: Fix _Py_NO_RETURN for GCC (GH-10300) (GH-10301)



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

(cherry picked from commit e2ed5adcb5db2d70cfa72da1ba8446f7aa9e05cd)


https://bugs.python.org/issue35147

Include/pyerrors.h

diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index f289471..f49d4e8 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -94,9 +94,9 @@
 #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__))
 #else
 #define _Py_NO_RETURN