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

Merge pull request #1161 from alex/abi3-fix-errors 

Fixed a few compilation errors on the abi3 branch
This commit is contained in:
Yuji Kanagawa 2020-09-07 17:32:46 +09:00 committed by GitHub
parent e0f75f80b1 4cd6d4c772
commit 3b61df25c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/class/number.rs
View File

@ -5,6 +5,8 @@
use crate::callback::IntoPyCallbackOutput;
use crate::err::PyErr;
use crate::{ffi, FromPyObject, PyClass, PyObject};
#[cfg(Py_LIMITED_API)]
use std::os::raw::c_void;
#[cfg(Py_LIMITED_API)]
#[derive(Clone)]
@ -26,6 +28,7 @@ pub struct PyNumberMethods {
pub nb_xor: Option<ffi::binaryfunc>,
pub nb_or: Option<ffi::binaryfunc>,
pub nb_int: Option<ffi::unaryfunc>,
#[allow(dead_code)]
pub nb_reserved: *mut c_void,
pub nb_float: Option<ffi::unaryfunc>,
pub nb_inplace_add: Option<ffi::binaryfunc>,

4
src/class/sequence.rs
View File

@ -8,6 +8,8 @@ use crate::conversion::{FromPyObject, IntoPy};
use crate::err::PyErr;
use crate::{exceptions, ffi, PyAny, PyCell, PyClass, PyObject};
use std::os::raw::c_int;
#[cfg(Py_LIMITED_API)]
use std::os::raw::c_void;
#[cfg(Py_LIMITED_API)]
#[derive(Clone)]
@ -16,8 +18,10 @@ pub struct PySequenceMethods {
pub sq_concat: Option<ffi::binaryfunc>,
pub sq_repeat: Option<ffi::ssizeargfunc>,
pub sq_item: Option<ffi::ssizeargfunc>,
#[allow(dead_code)]
pub was_sq_slice: *mut c_void,
pub sq_ass_item: Option<ffi::ssizeobjargproc>,
#[allow(dead_code)]
pub was_sq_ass_slice: *mut c_void,
pub sq_contains: Option<ffi::objobjproc>,
pub sq_inplace_concat: Option<ffi::binaryfunc>,