[Python-checkins] cpython (merge 3.6 -> default): Merge 3.6 (issue #28544)

[yury.selivanov]

https://hg.python.org/cpython/rev/9d95510dc203
changeset:   104783:9d95510dc203
parent:      104781:86b570d13f5a
parent:      104782:635f5854cb3e
user:        Yury Selivanov <yury at magic.io>
date:        Fri Oct 28 18:49:10 2016 -0400
summary:
  Merge 3.6 (issue #28544)

files:
  Include/dictobject.h |  2 +-
  Include/genobject.h  |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Include/dictobject.h b/Include/dictobject.h
--- a/Include/dictobject.h
+++ b/Include/dictobject.h
@@ -112,7 +112,7 @@
 PyAPI_FUNC(int) _PyDict_HasOnlyStringKeys(PyObject *mp);
 Py_ssize_t _PyDict_KeysSize(PyDictKeysObject *keys);
 Py_ssize_t _PyDict_SizeOf(PyDictObject *);
-PyObject *_PyDict_Pop(PyDictObject *, PyObject *, PyObject *);
+PyAPI_FUNC(PyObject *) _PyDict_Pop(PyDictObject *, PyObject *, PyObject *);
 PyObject *_PyDict_FromKeys(PyObject *, PyObject *, PyObject *);
 #define _PyDict_HasSplitTable(d) ((d)->ma_values != NULL)
 
diff --git a/Include/genobject.h b/Include/genobject.h
--- a/Include/genobject.h
+++ b/Include/genobject.h
@@ -42,7 +42,7 @@
     PyObject *name, PyObject *qualname);
 PyAPI_FUNC(int) PyGen_NeedsFinalizing(PyGenObject *);
 PyAPI_FUNC(int) _PyGen_FetchStopIterationValue(PyObject **);
-PyObject *_PyGen_Send(PyGenObject *, PyObject *);
+PyAPI_FUNC(PyObject *) _PyGen_Send(PyGenObject *, PyObject *);
 PyObject *_PyGen_yf(PyGenObject *);
 PyAPI_FUNC(void) _PyGen_Finalize(PyObject *self);
 

-- 
Repository URL: https://hg.python.org/cpython