Skip to content

Commit 5247425

Browse files
committed
---
yaml --- r: 39788 b: refs/heads/incoming c: b71381d h: refs/heads/master v: v3
1 parent be3733d commit 5247425

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: a0c2a9b7434b361147ebe407abd6701c11b1d597
9+
refs/heads/incoming: b71381dcc9c7393dec2f45267c538ff126893120
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/os.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -316,17 +316,21 @@ pub fn fdopen(fd: c_int) -> *FILE {
316316

317317
#[cfg(windows)]
318318
pub fn fsync_fd(fd: c_int, _level: io::fsync::Level) -> c_int {
319-
use libc::funcs::extra::msvcrt::*;
320-
return commit(fd);
319+
unsafe {
320+
use libc::funcs::extra::msvcrt::*;
321+
return commit(fd);
322+
}
321323
}
322324

323325
#[cfg(target_os = "linux")]
324326
pub fn fsync_fd(fd: c_int, level: io::fsync::Level) -> c_int {
325-
use libc::funcs::posix01::unistd::*;
326-
match level {
327-
io::fsync::FSync
328-
| io::fsync::FullFSync => return fsync(fd),
329-
io::fsync::FDataSync => return fdatasync(fd)
327+
unsafe {
328+
use libc::funcs::posix01::unistd::*;
329+
match level {
330+
io::fsync::FSync
331+
| io::fsync::FullFSync => return fsync(fd),
332+
io::fsync::FDataSync => return fdatasync(fd)
333+
}
330334
}
331335
}
332336

0 commit comments

Comments
 (0)