diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-06-07 15:57:13 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-06-10 21:10:56 +0200 |
| commit | 2bd585f31d7abb066e3f53d9b29c822af20aea69 (patch) | |
| tree | 281c7ada711f6c1ff43ab136c4b6f815d6ceef79 /pyuno/source/module/pyuno_callable.cxx | |
| parent | a7d864668cd9e328b1ec6e2afe8ffa22cbdf0e43 (diff) | |
Adapt to upcoming Python 3.8
...which changed PyTypeObject in <https://github.com/python/cpython/commit/
aacc77fbd77640a8f03638216fa09372cc21673d> "bpo-36974: implement PEP 590
(GH-13185)".
Change-Id: I687ec38aeda05d0747b9ed08221db75a758bed51
Reviewed-on: https://gerrit.libreoffice.org/73664
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'pyuno/source/module/pyuno_callable.cxx')
| -rw-r--r-- | pyuno/source/module/pyuno_callable.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx index 6519d20734c9..656d1c84cb0e 100644 --- a/pyuno/source/module/pyuno_callable.cxx +++ b/pyuno/source/module/pyuno_callable.cxx @@ -181,7 +181,11 @@ static PyTypeObject PyUNO_callable_Type = sizeof (PyUNO_callable), 0, ::pyuno::PyUNO_callable_del, - nullptr, +#if PY_VERSION_HEX >= 0x03080000 + 0, // Py_ssize_t tp_vectorcall_offset +#else + nullptr, // printfunc tp_print +#endif nullptr, nullptr, nullptr, @@ -225,6 +229,9 @@ static PyTypeObject PyUNO_callable_Type = , 0 #if PY_VERSION_HEX >= 0x03040000 , nullptr +#if PY_VERSION_HEX >= 0x03080000 + , nullptr // vectorcallfunc tp_vectorcall +#endif #endif }; |