summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYury Selivanov <yury@magic.io>2016-10-28 18:49:10 -0400
committerYury Selivanov <yury@magic.io>2016-10-28 18:49:10 -0400
commit1b6b6eb4537dae6345f78b8b0941eb0fae2b33d5 (patch)
treeedaa67ac4938bf866f49aa1832975a7f76228cac
parentfcb5c64a9aa9f592281859d775f4859dee877700 (diff)
parent833c626e6739f7610593e7831166af6d2e064d74 (diff)
downloadcpython-git-1b6b6eb4537dae6345f78b8b0941eb0fae2b33d5.tar.gz
Merge 3.6 (issue #28544)
-rw-r--r--Include/dictobject.h2
-rw-r--r--Include/genobject.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Include/dictobject.h b/Include/dictobject.h
index f06f2409c8..5cf6db1f08 100644
--- a/Include/dictobject.h
+++ b/Include/dictobject.h
@@ -112,7 +112,7 @@ PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp);
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
index 973bdd5f56..1ee4fd5529 100644
--- a/Include/genobject.h
+++ b/Include/genobject.h
@@ -42,7 +42,7 @@ PyAPI_FUNC(PyObject *) PyGen_NewWithQualName(struct _frame *,
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);