From dc604308b7b442e9182b8522c48fd058fa61e4a3 Mon Sep 17 00:00:00 2001 From: Alexey Izbyshev Date: Fri, 2 Nov 2018 19:32:26 +0300 Subject: [PATCH] [3.6] bpo-35147: Fix _Py_NO_RETURN for GCC (GH-10300) Use `__GNUC__` instead of non-existing `__GNUC_MAJOR__`. https://bugs.python.org/issue35147. (cherry picked from commit e2ed5adcb5db2d70cfa72da1ba8446f7aa9e05cd) Co-authored-by: Alexey Izbyshev --- Include/pyerrors.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Include/pyerrors.h b/Include/pyerrors.h index c28c1373f82f2b7..44f20303c299ba5 100644 --- a/Include/pyerrors.h +++ b/Include/pyerrors.h @@ -93,9 +93,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__)) #else #define _Py_NO_RETURN