[Python-checkins] [3.7] bpo-35147: Fix _Py_NO_RETURN for GCC (GH-10300) (GH-10301)
Miss Islington (bot)
webhook-mailer at python.org
Fri Nov 2 21:30:16 EDT 2018
https://github.com/python/cpython/commit/a9122d183b1fbc4484d72aec69fc0979c7fd91f2
commit: a9122d183b1fbc4484d72aec69fc0979c7fd91f2
branch: 3.7
author: Alexey Izbyshev <izbyshev at ispras.ru>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2018-11-02T18:30:11-07:00
summary:
[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
files:
M Include/pyerrors.h
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index f289471be20c..f49d4e8bd08c 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__))
#else
#define _Py_NO_RETURN
More information about the Python-checkins
mailing list