Merge pull request #2434 from alex/ffi-fixes

ffi: fixes for field names/presence
PyO3 · Jun 5, 2022 · 330fccc · 330fccc
2 parents 65616d2 + 9cfbdec
commit 330fccc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pyo3-ffi/src/cpython/frameobject.rs b/pyo3-ffi/src/cpython/frameobject.rs
@@ -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],

diff --git a/pyo3-ffi/src/cpython/initconfig.rs b/pyo3-ffi/src/cpython/initconfig.rs
@@ -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" {