Commit 48050cbb authored by Andrew Svetlov's avatar Andrew Svetlov

Merge 3.4

parents 0f51d04b 9df36c94
...@@ -89,6 +89,8 @@ Core and Builtins ...@@ -89,6 +89,8 @@ Core and Builtins
- Issue #24044: Fix possible null pointer dereference in list.sort in out of - Issue #24044: Fix possible null pointer dereference in list.sort in out of
memory conditions. memory conditions.
- Issue #21354: PyCFunction_New function is exposed by python DLL again.
Library Library
------- -------
......
...@@ -16,7 +16,7 @@ static int numfree = 0; ...@@ -16,7 +16,7 @@ static int numfree = 0;
/* undefine macro trampoline to PyCFunction_NewEx */ /* undefine macro trampoline to PyCFunction_NewEx */
#undef PyCFunction_New #undef PyCFunction_New
PyObject * PyAPI_FUNC(PyObject *)
PyCFunction_New(PyMethodDef *ml, PyObject *self) PyCFunction_New(PyMethodDef *ml, PyObject *self)
{ {
return PyCFunction_NewEx(ml, self, NULL); return PyCFunction_NewEx(ml, self, NULL);
......
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