From 7d1dd4d1996b2f153e25409e3156310e73b9d774 Mon Sep 17 00:00:00 2001 From: Jeong YunWon Date: Sat, 18 Sep 2021 23:27:16 +0900 Subject: [PATCH] Fix x86 build --- vm/src/crt_fd.rs | 2 +- vm/src/stdlib/io.rs | 2 +- vm/src/stdlib/os.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vm/src/crt_fd.rs b/vm/src/crt_fd.rs index 12ab7afe7..ee9ebdec6 100644 --- a/vm/src/crt_fd.rs +++ b/vm/src/crt_fd.rs @@ -62,7 +62,7 @@ impl Fd { cvt(unsafe { suppress_iph!(libc::close(self.0)) }, drop) } - pub fn ftruncate(&self, len: i64) -> io::Result<()> { + pub fn ftruncate(&self, len: crate::stdlib::os::Offset) -> io::Result<()> { cvt(unsafe { suppress_iph!(ftruncate(self.0, len)) }, drop) } diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs index ea2c32fd2..f04e1bb92 100644 --- a/vm/src/stdlib/io.rs +++ b/vm/src/stdlib/io.rs @@ -930,7 +930,7 @@ mod _io { if !self.valid_write() || self.write_pos > self.pos { self.write_pos = self.pos } - self.adjust_position(self.pos + buf.len() as i64); + self.adjust_position(self.pos + buf.len() as Offset); if self.pos > self.write_end { self.write_end = self.pos } diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs index c1dcf74cc..1975e4204 100644 --- a/vm/src/stdlib/os.rs +++ b/vm/src/stdlib/os.rs @@ -513,7 +513,7 @@ mod _os { #[pyarg(any)] in_fd: i32, #[pyarg(any)] - offset: i64, + offset: Offset, #[pyarg(any)] count: i64, #[cfg(target_os = "macos")] @@ -1657,7 +1657,7 @@ mod _os { } #[pyfunction] - pub fn ftruncate(fd: i32, length: i64, vm: &VirtualMachine) -> PyResult<()> { + pub fn ftruncate(fd: i32, length: Offset, vm: &VirtualMachine) -> PyResult<()> { Fd(fd).ftruncate(length).map_err(|e| e.into_pyexception(vm)) }