Fix OSX

rust-lang · Sep 23, 2015 · 41e7a69 · 41e7a69
1 parent 1791046
commit 41e7a69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
@@ -19,9 +19,9 @@ pub enum timezone {}
 
 s! {
     pub struct glob_t {
-        pub gl_pathc:  size_t,
+        pub gl_pathc:  ::size_t,
         __unused1: ::c_int,
-        pub gl_offs:   size_t,
+        pub gl_offs:   ::size_t,
         __unused2: ::c_int,
         pub gl_pathv:  *mut *mut ::c_char,
 
@@ -389,7 +389,7 @@ pub const _SC_XOPEN_XCU_VERSION: ::c_int = 121;
 
 pub const PTHREAD_CREATE_JOINABLE: ::c_int = 1;
 pub const PTHREAD_CREATE_DETACHED: ::c_int = 2;
-pub const PTHREAD_STACK_MIN: size_t = 8192;
+pub const PTHREAD_STACK_MIN: ::size_t = 8192;
 
 pub const RLIMIT_CPU: ::c_int = 0;
 pub const RLIMIT_FSIZE: ::c_int = 1;

diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs
@@ -5,7 +5,7 @@ pub type useconds_t = u32;
 pub type blkcnt_t = i64;
 pub type socklen_t = u32;
 pub type sa_family_t = u8;
-pub type pthread_t = uintptr_t;
+pub type pthread_t = ::uintptr_t;
 
 s! {
     pub struct sockaddr {
@@ -76,11 +76,11 @@ pub const IPV6_MULTICAST_LOOP: ::c_int = 11;
 pub const IPV6_V6ONLY: ::c_int = 27;
 
 extern {
-    pub fn mincore(addr: *const ::c_void, len: size_t,
+    pub fn mincore(addr: *const ::c_void, len: ::size_t,
                    vec: *mut c_char) -> ::c_int;
     pub fn sysctlnametomib(name: *const c_char,
                            mibp: *mut ::c_int,
-                           sizep: *mut size_t)
+                           sizep: *mut ::size_t)
                            -> ::c_int;
     pub fn setgroups(ngroups: ::c_int,
                      ptr: *const ::gid_t) -> ::c_int;