Auto merge of #949 - humenda:master, r=alexcrichton

redefine pthread_t for l4re-uclibc

src/unix/uclibc/mips/mod.rs

@@ -1,3 +1,5 @@
+pub type pthread_t = ::c_ulong;
+
 pub const SFD_CLOEXEC: ::c_int = 0x080000;
 
 pub const NCCS: usize = 32;

src/unix/uclibc/mod.rs

@@ -11,7 +11,6 @@ pub type id_t = ::c_uint;
 pub type useconds_t = u32;
 pub type dev_t = u64;
 pub type socklen_t = u32;
-pub type pthread_t = ::c_ulong;
 pub type mode_t = u32;
 pub type ino64_t = u64;
 pub type off64_t = i64;

src/unix/uclibc/x86_64/l4re.rs

@@ -4,6 +4,7 @@
 /// libc and hence we should provide them here.
 
 pub type l4_umword_t = ::c_ulong; // Unsigned machine word.
+pub type pthread_t = *mut ::c_void;
 
 s! {
     /// CPU sets.

src/unix/uclibc/x86_64/mod.rs

@@ -352,6 +352,9 @@ cfg_if! {
     if #[cfg(target_os = "l4re")] {
         mod l4re;
         pub use self::l4re::*;
-    } else { }
+    } else {
+        mod other;
+        pub use other::*;
+    }
 }
 

src/unix/uclibc/x86_64/other.rs

@@ -0,0 +1,4 @@
+// Thestyle checker discourages the use of #[cfg], so this has to go into a
+// separate module
+pub type pthread_t = ::c_ulong;
+