diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2013-10-07 20:40:59 +0200 |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2013-10-07 20:40:59 +0200 |
commit | 1cfa0ba8833c18a330fe9653276de29911198dec (patch) | |
tree | 534449bba373b0d1f796be7394da57e7b766f3ee /Include/pyerrors.h | |
parent | Close #19156: add tests and fix for Enum helper edge cases. Patch from CliffM. (diff) | |
parent | Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at least... (diff) | |
download | cpython-1cfa0ba8833c18a330fe9653276de29911198dec.tar.gz cpython-1cfa0ba8833c18a330fe9653276de29911198dec.tar.bz2 cpython-1cfa0ba8833c18a330fe9653276de29911198dec.zip |
Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at least one place so as to avoid regressions.
Diffstat (limited to 'Include/pyerrors.h')
-rw-r--r-- | Include/pyerrors.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Include/pyerrors.h b/Include/pyerrors.h index f89d1add20a..224567ba59c 100644 --- a/Include/pyerrors.h +++ b/Include/pyerrors.h @@ -101,7 +101,7 @@ PyAPI_FUNC(void) Py_FatalError(const char *message) _Py_NO_RETURN; #if defined(Py_DEBUG) || defined(Py_LIMITED_API) #define _PyErr_OCCURRED() PyErr_Occurred() #else -#define _PyErr_OCCURRED() (_PyThreadState_Current->curexc_type) +#define _PyErr_OCCURRED() (PyThreadState_GET()->curexc_type) #endif /* Error testing and normalization */ |