mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change how the readdir/opendir hack works

Browse Source
This commit is contained in:
Corey Richardson 2014-03-18 11:18:58 -04:00 committed by Alex Crichton
parent 308c03501a
commit 06ad5eb459
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/liblibc/lib.rs
View File

@ -3695,18 +3695,12 @@ pub mod funcs {
// opendir$INODE64, etc. but for some reason rustc
// doesn't link it correctly on i686, so we're going
// through a C function that mysteriously does work.
pub unsafe fn opendir(dirname: *c_char) -> *DIR {
rust_opendir(dirname)
}
pub unsafe fn readdir_r(dirp: *DIR,
entry: *mut dirent_t,
result: *mut *mut dirent_t) -> c_int {
rust_readdir_r(dirp, entry, result)
}
extern {
fn rust_opendir(dirname: *c_char) -> *DIR;
fn rust_readdir_r(dirp: *DIR, entry: *mut dirent_t,
#[link_name="rust_opendir"]
pub fn opendir(dirname: *c_char) -> *DIR;
#[link_name="rust_readdir_r"]
pub fn readdir_r(dirp: *DIR, entry: *mut dirent_t,
result: *mut *mut dirent_t) -> c_int;
}
@ -4321,3 +4315,5 @@ pub mod funcs {
}
}
}
#[test] fn work_on_windows() { } // FIXME #10872 needed for a happy windows