diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2017-02-09 16:08:17 +0100 |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2017-02-09 16:08:17 +0100 |
| commit | c6180bb73c8c7c7f9d8ea9816487b710597b6fc1 (patch) | |
| tree | fb4a5c18886537b4b7df46ed3b2aa579747ff507 /Include/odictobject.h | |
| parent | 5e0114a832a903518c4af6983161c0c2a8942a24 (diff) | |
| parent | 819a21a3a4aac38f32e1ba4f68bcef45591fa3f0 (diff) | |
| download | cpython-c6180bb73c8c7c7f9d8ea9816487b710597b6fc1.tar.gz | |
Merge issue #26355 fix from Python 3.5
Diffstat (limited to 'Include/odictobject.h')
| -rw-r--r-- | Include/odictobject.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Include/odictobject.h b/Include/odictobject.h index c1d9592a1d..381de58ba4 100644 --- a/Include/odictobject.h +++ b/Include/odictobject.h @@ -17,12 +17,13 @@ PyAPI_DATA(PyTypeObject) PyODictKeys_Type; PyAPI_DATA(PyTypeObject) PyODictItems_Type; PyAPI_DATA(PyTypeObject) PyODictValues_Type; -#endif /* Py_LIMITED_API */ - #define PyODict_Check(op) PyObject_TypeCheck(op, &PyODict_Type) #define PyODict_CheckExact(op) (Py_TYPE(op) == &PyODict_Type) #define PyODict_SIZE(op) ((PyDictObject *)op)->ma_used -#define PyODict_HasKey(od, key) (PyMapping_HasKey(PyObject *)od, key) + +#endif /* Py_LIMITED_API */ + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 PyAPI_FUNC(PyObject *) PyODict_New(void); PyAPI_FUNC(int) PyODict_SetItem(PyObject *od, PyObject *key, PyObject *item); @@ -37,6 +38,8 @@ PyAPI_FUNC(int) PyODict_DelItem(PyObject *od, PyObject *key); #define PyODict_GetItemString(od, key) \ PyDict_GetItemString((PyObject *)od, key) +#endif + #ifdef __cplusplus } #endif |