New upstream version 0.52.0

[cargo.git] / vendor / libc / src / unix / linux_like / android / b32 / mod.rs

diff --git a/vendor/libc/src/unix/linux_like/android/b32/mod.rs b/vendor/libc/src/unix/linux_like/android/b32/mod.rs
index 5c4f03234ef18b9aae2bbcfdec589e7cb67b77f9..774690704e6d5ac4faf42c7101f16a9fa318dbba 100644 (file)
--- a/vendor/libc/src/unix/linux_like/android/b32/mod.rs
+++ b/vendor/libc/src/unix/linux_like/android/b32/mod.rs
@@ -74,7 +74,7 @@ s! {
         pub f_bavail: u64,
         pub f_files: u64,
         pub f_ffree: u64,
-        f_fsid: [u32; 2],
+        pub f_fsid: ::__fsid_t,
         pub f_namelen: u32,
         pub f_frsize: u32,
         pub f_flags: u32,
@@ -197,10 +197,8 @@ pub const PTRACE_SETFPREGS: ::c_int = 15;
 pub const PTRACE_GETREGS: ::c_int = 12;
 pub const PTRACE_SETREGS: ::c_int = 13;
 
-pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t =
-    pthread_mutex_t { value: 0 };
-pub const PTHREAD_COND_INITIALIZER: pthread_cond_t =
-    pthread_cond_t { value: 0 };
+pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t { value: 0 };
+pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t { value: 0 };
 pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
     lock: PTHREAD_MUTEX_INITIALIZER,
     cond: PTHREAD_COND_INITIALIZER,