diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2017-02-01 22:37:49 +0300 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2017-02-01 22:37:49 +0300 |
| commit | a706118dafc16edfed490c53db02c08aefe7b097 (patch) | |
| tree | 6416a9ea3398ea769857b79a8036f9ffe098c95e /Include/odictobject.h | |
| parent | 1966772d17f49c740be143d9d4622be13e850f15 (diff) | |
| parent | ba5a055a00d91a449a23ae14dd468e9b769a6b74 (diff) | |
| download | cpython-a706118dafc16edfed490c53db02c08aefe7b097.tar.gz | |
Issue #29407: Merge from 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 |