luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2434 from alex/ffi-fixes 

ffi: fixes for field names/presence
This commit is contained in:
David Hewitt 2022-06-05 13:05:49 +01:00 committed by GitHub
parent 65616d2f17 9cfbdeca78
commit 330fcccf97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyo3-ffi/src/cpython/frameobject.rs
View File

@ -32,6 +32,7 @@ pub struct PyFrameObject {
#[cfg(not(Py_3_10))]
pub f_stacktop: *mut *mut PyObject,
pub f_trace: *mut PyObject,
#[cfg(Py_3_10)]
pub f_stackdepth: c_int,
pub f_trace_lines: c_char,
pub f_trace_opcodes: c_char,
@ -43,6 +44,7 @@ pub struct PyFrameObject {
pub f_iblock: c_int,
#[cfg(not(Py_3_10))]
pub f_executing: c_char,
#[cfg(Py_3_10)]
pub f_state: PyFrameState,
pub f_blockstack: [PyTryBlock; crate::CO_MAXBLOCKS],
pub f_localsplus: [*mut PyObject; 1],

2
pyo3-ffi/src/cpython/initconfig.rs
View File

@ -168,7 +168,7 @@ pub struct PyConfig {
#[cfg(Py_3_11)]
pub _is_python_build: c_int,
#[cfg(all(Py_3_9, not(Py_3_10)))]
pub orig_argv: PyWideStringList,
pub _orig_argv: PyWideStringList,
}
extern "C" {