Merge pull request rust-lang#39 from semarie/openbsd

openbsd port
keeperofdakeys · Nov 4, 2015 · d3bd281 · d3bd281
2 parents 3bb2fef + cb6ef24
commit d3bd281
Show file tree

Hide file tree

Showing 4 changed files with 442 additions and 448 deletions.
diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs
@@ -149,7 +149,7 @@ cfg_if! {
  mod apple;
  pub use self::apple::*;
  } else if #[cfg(any(target_os = "openbsd", target_os = "netbsd",
- target_os = "dragonfly"))] {
+ target_os = "bitrig"))] {
  mod openbsdlike;
  pub use self::openbsdlike::*;
  } else if #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] {

diff --git a/src/unix/bsd/openbsdlike/bitrig.rs b/src/unix/bsd/openbsdlike/bitrig.rs
@@ -1,16 +1,16 @@
 s! {
  pub struct glob_t {
- pub gl_pathc: c_int,
- pub gl_matchc: c_int,
- pub gl_offs: c_int,
- pub gl_flags: c_int,
- pub gl_pathv: *mut *mut c_char,
- __unused1: *mut c_void,
- __unused2: *mut c_void,
- __unused3: *mut c_void,
- __unused4: *mut c_void,
- __unused5: *mut c_void,
- __unused6: *mut c_void,
- __unused7: *mut c_void,
+ pub gl_pathc: ::c_int,
+ pub gl_matchc: ::c_int,
+ pub gl_offs: ::c_int,
+ pub gl_flags: ::c_int,
+ pub gl_pathv: *mut *mut ::c_char,
+ __unused1: *mut ::c_void,
+ __unused2: *mut ::c_void,
+ __unused3: *mut ::c_void,
+ __unused4: *mut ::c_void,
+ __unused5: *mut ::c_void,
+ __unused6: *mut ::c_void,
+ __unused7: *mut ::c_void,
  }
 }