diff options
| author | Nathaniel J. Smith <njs@pobox.com> | 2016-05-13 08:24:07 -0700 |
|---|---|---|
| committer | Nathaniel J. Smith <njs@pobox.com> | 2016-05-13 08:24:07 -0700 |
| commit | 2555e44986b6d1ffb34ea3aed511b5812d4e3923 (patch) | |
| tree | 130e0775e75b3d74600854d16ed33fc0e7c7c360 /numpy | |
| parent | f1a36312b0996495a499ec4e5a9de14148bf957c (diff) | |
| parent | 42b3902caa1257520035e0e0fafe52f28fd41076 (diff) | |
| download | numpy-2555e44986b6d1ffb34ea3aed511b5812d4e3923.tar.gz | |
Merge pull request #7630 from mattip/define-PyDictProxy_Check
MAINT: add ifdef around PyDictProxy_Check macro
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/descriptor.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c index 7a1d44d08..7886179f1 100644 --- a/numpy/core/src/multiarray/descriptor.c +++ b/numpy/core/src/multiarray/descriptor.c @@ -29,7 +29,9 @@ #define NPY_NEXT_ALIGNED_OFFSET(offset, alignment) \ (((offset) + (alignment) - 1) & (-(alignment))) +#ifndef PyDictProxy_Check #define PyDictProxy_Check(obj) (Py_TYPE(obj) == &PyDictProxy_Type) +#endif static PyObject *typeDict = NULL; /* Must be explicitly loaded */ |