Commit a47034e9 authored by Stefan Behnel's avatar Stefan Behnel

repair __Pyx_CallUnboundCMethod1() macro which also needs to adapt to the new...

repair __Pyx_CallUnboundCMethod1() macro which also needs to adapt to the new CPython FASTCALL signature in Py3.7
parent c2521795
...@@ -1189,8 +1189,12 @@ static PyObject* __Pyx__CallUnboundCMethod1(__Pyx_CachedCFunction* cfunc, PyObje ...@@ -1189,8 +1189,12 @@ static PyObject* __Pyx__CallUnboundCMethod1(__Pyx_CachedCFunction* cfunc, PyObje
#define __Pyx_CallUnboundCMethod1(cfunc, self, arg) \ #define __Pyx_CallUnboundCMethod1(cfunc, self, arg) \
((likely((cfunc)->func && (cfunc)->flag == METH_O)) ? (*((cfunc)->func))(self, arg) : \ ((likely((cfunc)->func && (cfunc)->flag == METH_O)) ? (*((cfunc)->func))(self, arg) : \
((PY_VERSION_HEX >= 0x030600B1 && (cfunc)->func && (cfunc)->flag == METH_FASTCALL) ? \ ((PY_VERSION_HEX >= 0x030600B1 && (cfunc)->func && (cfunc)->flag == METH_FASTCALL) ? \
(*(__Pyx_PyCFunctionFast)(cfunc)->func)(self, &arg, 1, NULL) : \ (PY_VERSION_HEX >= 0x030700A0 ? \
__Pyx__CallUnboundCMethod1(cfunc, self, arg))) (*(__Pyx_PyCFunctionFast)(cfunc)->func)(self, &arg, 1) : \
(*(__Pyx_PyCFunctionFastWithKeywords)(cfunc)->func)(self, &arg, 1, NULL)) : \
(PY_VERSION_HEX >= 0x030700A0 && (cfunc)->func && (cfunc)->flag == (METH_FASTCALL | METH_KEYWORDS) ? \
(*(__Pyx_PyCFunctionFastWithKeywords)(cfunc)->func)(self, &arg, 1, NULL) : \
__Pyx__CallUnboundCMethod1(cfunc, self, arg))))
#else #else
#define __Pyx_CallUnboundCMethod1(cfunc, self, arg) __Pyx__CallUnboundCMethod1(cfunc, self, arg) #define __Pyx_CallUnboundCMethod1(cfunc, self, arg) __Pyx__CallUnboundCMethod1(cfunc, self, arg)
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment