From 79f657c6e74004d9da5b3dc1b3fd17089e4a75be Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Thu, 3 Mar 2016 18:16:27 +0200 Subject: Issue #26476: Fixed compilation error when use PyErr_BadInternalCall() in C++. Patch by Jeroen Demeyer. --- Include/pyerrors.h | 2 +- Misc/NEWS | 6 ++++++ Python/errors.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Include/pyerrors.h b/Include/pyerrors.h index 2ef205e..51134ef 100644 --- a/Include/pyerrors.h +++ b/Include/pyerrors.h @@ -215,7 +215,7 @@ PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int); /* Export the old function so that the existing API remains available: */ 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 Python 2.0: */ #define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__) diff --git a/Misc/NEWS b/Misc/NEWS index ac564b7..51220c3 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -174,6 +174,12 @@ Build - 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? ============================ diff --git a/Python/errors.c b/Python/errors.c index e7c221c..d823e13 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -532,7 +532,7 @@ PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename( #endif /* MS_WINDOWS */ void -_PyErr_BadInternalCall(char *filename, int lineno) +_PyErr_BadInternalCall(const char *filename, int lineno) { PyErr_Format(PyExc_SystemError, "%s:%d: bad argument to internal function", -- cgit v0.12