Merge 3.4

asvetlov · asvetlov · commit 359f710e2b23 · 2015-04-27T17:49:16.000+03:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -89,6 +89,8 @@ Core and Builtins
 - Issue #24044: Fix possible null pointer dereference in list.sort in out of
   memory conditions.
 
+- Issue #21354: PyCFunction_New function is exposed by python DLL again.
+
 Library
 -------
 
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
@@ -16,7 +16,7 @@ static int numfree = 0;
 /* undefine macro trampoline to PyCFunction_NewEx */
 #undef PyCFunction_New
 
-PyObject *
+PyAPI_FUNC(PyObject *)
 PyCFunction_New(PyMethodDef *ml, PyObject *self)
 {
     return PyCFunction_NewEx(ml, self, NULL);

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ static int numfree = 0;`
`16`	`16`	`/* undefine macro trampoline to PyCFunction_NewEx */`
`17`	`17`	`#undef PyCFunction_New`
`18`	`18`
`19`		`-PyObject *`
	`19`	`+PyAPI_FUNC(PyObject *)`
`20`	`20`	`PyCFunction_New(PyMethodDef ml, PyObject self)`
`21`	`21`	`{`
`22`	`22`	`return PyCFunction_NewEx(ml, self, NULL);`