Skip to content

Commit 02153dc

Browse files
committed
Use the "system" abi introduced by rust-lang/rust#10367
1 parent 8d1e7c3 commit 02153dc

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/channel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ mod libc {
3232
iov_len: size_t,
3333
}
3434

35-
extern {
35+
extern "system" {
3636
/// Read data from fd into multiple buffers
3737
pub fn readv (fd: c_int, iov: *mut iovec, iovcnt: c_int) -> ssize_t;
3838
/// Write data from multiple buffers to fd

src/native.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ use std::libc::{c_int, c_char};
99
// Link with libosxfuse on OS X
1010
#[cfg(target_os = "macos")]
1111
#[link_args = "-losxfuse"]
12-
extern {}
12+
extern "system" { }
1313

1414
// Link with libfuse on Linux
1515
#[cfg(target_os = "linux")]
1616
#[link_args = "-lfuse"]
17-
extern {}
17+
extern "system" { }
1818

1919
/*
2020
* FUSE arguments (see fuse_opt.h for details)
@@ -30,7 +30,7 @@ pub struct fuse_args {
3030
* FUSE common (see fuse_common_compat.h for details)
3131
*/
3232

33-
extern {
33+
extern "system" {
3434
pub fn fuse_mount_compat25 (mountpoint: *c_char, args: *fuse_args) -> c_int;
3535
pub fn fuse_unmount_compat22 (mountpoint: *c_char);
3636
}

0 commit comments

Comments
 (0)