summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2012-06-04 13:41:48 (GMT)
committerBarry Warsaw <barry@python.org>2012-06-04 13:41:48 (GMT)
commitc58c392da7f8fb49b84b2f4de35d3c40ed6d36c1 (patch)
treea574ea8bd98e1d8d3be264c68b9952bda33b18c6 /Include
parent409da157d7ff2a49892e20a94a3fc83475845d22 (diff)
parentbcd304480f16f3f936a7bdbff4dfab41f8e30292 (diff)
downloadcpython-c58c392da7f8fb49b84b2f4de35d3c40ed6d36c1.zip
cpython-c58c392da7f8fb49b84b2f4de35d3c40ed6d36c1.tar.gz
cpython-c58c392da7f8fb49b84b2f4de35d3c40ed6d36c1.tar.bz2
Trunk merge.
Diffstat (limited to 'Include')
-rw-r--r--Include/pyerrors.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index fb6281c..cfae922 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -87,7 +87,7 @@ PyAPI_FUNC(void) PyErr_GetExcInfo(PyObject **, PyObject **, PyObject **);
PyAPI_FUNC(void) PyErr_SetExcInfo(PyObject *, PyObject *, PyObject *);
#if defined(__clang__) || \
- (defined(__GNUC__) && \
+ (defined(__GNUC_MAJOR__) && \
((__GNUC_MAJOR__ >= 3) || \
(__GNUC_MAJOR__ == 2) && (__GNUC_MINOR__ >= 5)))
#define _Py_NO_RETURN __attribute__((__noreturn__))