diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-13 13:03:18 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-13 13:07:52 +0200 |
| commit | 843b476cf4bf7f20c7a3c433e41a76995b0cebca (patch) | |
| tree | 3f3dc80c8c8c370e0d62462f9d352412b9cb4595 /sources/shiboken2/libshiboken/pep384impl.h | |
| parent | 3899ed571eb2b453736b3b55a8991df83d33d609 (diff) | |
| parent | 7211180820d76814c7060d39d7ce0e9902865e14 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I509b55363c29639cd29bfbc012c4bda3a4d008e5
Diffstat (limited to 'sources/shiboken2/libshiboken/pep384impl.h')
| -rw-r--r-- | sources/shiboken2/libshiboken/pep384impl.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sources/shiboken2/libshiboken/pep384impl.h b/sources/shiboken2/libshiboken/pep384impl.h index 2bfe52254..2a14d6543 100644 --- a/sources/shiboken2/libshiboken/pep384impl.h +++ b/sources/shiboken2/libshiboken/pep384impl.h @@ -98,7 +98,7 @@ typedef struct _typeobject { void *X13; // hashfunc tp_hash; ternaryfunc tp_call; reprfunc tp_str; - void *X16; // getattrofunc tp_getattro; + getattrofunc tp_getattro; void *X17; // setattrofunc tp_setattro; void *X18; // PyBufferProcs *tp_as_buffer; unsigned long tp_flags; @@ -110,7 +110,7 @@ typedef struct _typeobject { void *X25; // getiterfunc tp_iter; iternextfunc tp_iternext; struct PyMethodDef *tp_methods; - void *X28; // struct PyMemberDef *tp_members; + struct PyMemberDef *tp_members; struct PyGetSetDef *tp_getset; struct _typeobject *tp_base; PyObject *tp_dict; @@ -531,6 +531,9 @@ extern LIBSHIBOKEN_API PyTypeObject *PepMethodDescr_TypePtr; LIBSHIBOKEN_API PyObject *PyImport_GetModule(PyObject *name); #endif // PY_VERSION_HEX < 0x03070000 || defined(Py_LIMITED_API) +// Evaluate a script and return the variable `result` +LIBSHIBOKEN_API PyObject *PepRun_GetResult(const char *command); + /***************************************************************************** * * Python 2 incompatibilities |