Kaydet (Commit) 79f657c6 authored tarafından Serhiy Storchaka's avatar Serhiy Storchaka

Issue #26476: Fixed compilation error when use PyErr_BadInternalCall() in C++.

Patch by Jeroen Demeyer.
üst bb569362
...@@ -215,7 +215,7 @@ PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int); ...@@ -215,7 +215,7 @@ PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int);
/* Export the old function so that the existing API remains available: */ /* Export the old function so that the existing API remains available: */
PyAPI_FUNC(void) PyErr_BadInternalCall(void); PyAPI_FUNC(void) PyErr_BadInternalCall(void);
PyAPI_FUNC(void) _PyErr_BadInternalCall(char *filename, int lineno); PyAPI_FUNC(void) _PyErr_BadInternalCall(const char *filename, int lineno);
/* Mask the old API with a call to the new API for code compiled under /* Mask the old API with a call to the new API for code compiled under
Python 2.0: */ Python 2.0: */
#define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__) #define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__)
......
...@@ -174,6 +174,12 @@ Build ...@@ -174,6 +174,12 @@ Build
- Issue #25136: Support Apple Xcode 7's new textual SDK stub libraries. - Issue #25136: Support Apple Xcode 7's new textual SDK stub libraries.
C API
-----
- Issue #26476: Fixed compilation error when use PyErr_BadInternalCall() in C++.
Patch by Jeroen Demeyer.
What's New in Python 2.7.11? What's New in Python 2.7.11?
============================ ============================
......
...@@ -532,7 +532,7 @@ PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename( ...@@ -532,7 +532,7 @@ PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename(
#endif /* MS_WINDOWS */ #endif /* MS_WINDOWS */
void void
_PyErr_BadInternalCall(char *filename, int lineno) _PyErr_BadInternalCall(const char *filename, int lineno)
{ {
PyErr_Format(PyExc_SystemError, PyErr_Format(PyExc_SystemError,
"%s:%d: bad argument to internal function", "%s:%d: bad argument to internal function",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment