diff options
| author | Felix S. Klock II <pnkfelix@pnkfx.org> | 2013-09-25 23:38:59 +0200 |
|---|---|---|
| committer | Felix S. Klock II <pnkfelix@pnkfx.org> | 2013-09-25 23:38:59 +0200 |
| commit | 48b4b1f52c920f54ef13a739e3cd86cb7434bd9f (patch) | |
| tree | b341e55dabc13a68abe075bba394c4a84a8f6ea7 /src/libstd | |
| parent | 7e809819c6b1b967a4e39f45bae4da0336098e03 (diff) | |
| download | rust-48b4b1f52c920f54ef13a739e3cd86cb7434bd9f.tar.gz rust-48b4b1f52c920f54ef13a739e3cd86cb7434bd9f.zip | |
errfunc ptr is nullable, so use Option as part of interface to glob (#7752).
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/libc.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/libc.rs b/src/libstd/libc.rs index 770ee96a895..e772ade135e 100644 --- a/src/libstd/libc.rs +++ b/src/libstd/libc.rs @@ -3226,11 +3226,12 @@ pub mod funcs { pub mod glob { use libc::types::os::arch::c95::{c_char, c_int}; use libc::types::os::common::posix01::{glob_t}; + use option::Option; extern { pub fn glob(pattern: *c_char, flags: c_int, - errfunc: extern "C" fn(epath: *c_char, errno: int) -> int, + errfunc: Option<extern "C" fn(epath: *c_char, errno: int) -> int>, pglob: *mut glob_t); pub fn globfree(pglob: *mut glob_t); } |