From d8a58488bd56ef9c09e167173124c3519bc7405d Mon Sep 17 00:00:00 2001
From: Daniel Mueller <deso@posteo.net>
Date: Mon, 15 Jan 2018 09:30:24 -0800
Subject: Update libc crate to 0.2.36

Import subrepo libc/:libc at 16a0f4a3d6c836f88f50c58f5d0a74a32cbf0193
---
 libc/src/unix/notbsd/linux/other/b64/mod.rs | 51 +++++++++++++++++++----------
 1 file changed, 33 insertions(+), 18 deletions(-)

(limited to 'libc/src/unix/notbsd/linux/other/b64/mod.rs')

diff --git a/libc/src/unix/notbsd/linux/other/b64/mod.rs b/libc/src/unix/notbsd/linux/other/b64/mod.rs
index aa0e091..7fcf8ba 100644
--- a/libc/src/unix/notbsd/linux/other/b64/mod.rs
+++ b/libc/src/unix/notbsd/linux/other/b64/mod.rs
@@ -1,32 +1,39 @@
 //! 64-bit specific definitions for linux-like values
 
-pub type c_long = i64;
-pub type c_ulong = u64;
 pub type clock_t = i64;
 pub type time_t = i64;
 pub type ino_t = u64;
 pub type off_t = i64;
 pub type blkcnt_t = i64;
-pub type __fsword_t = ::c_long;
+pub type __fsword_t = i64;
+pub type shmatt_t = u64;
+pub type msgqnum_t = u64;
+pub type msglen_t = u64;
+pub type fsblkcnt_t = u64;
+pub type fsfilcnt_t = u64;
+pub type rlim_t = u64;
 
 s! {
     pub struct sigset_t {
-        __val: [::c_ulong; 16],
+        #[cfg(target_pointer_width = "32")]
+        __val: [u32; 32],
+        #[cfg(target_pointer_width = "64")]
+        __val: [u64; 16],
     }
 
     pub struct sysinfo {
-        pub uptime: ::c_long,
-        pub loads: [::c_ulong; 3],
-        pub totalram: ::c_ulong,
-        pub freeram: ::c_ulong,
-        pub sharedram: ::c_ulong,
-        pub bufferram: ::c_ulong,
-        pub totalswap: ::c_ulong,
-        pub freeswap: ::c_ulong,
+        pub uptime: i64,
+        pub loads: [u64; 3],
+        pub totalram: u64,
+        pub freeram: u64,
+        pub sharedram: u64,
+        pub bufferram: u64,
+        pub totalswap: u64,
+        pub freeswap: u64,
         pub procs: ::c_ushort,
         pub pad: ::c_ushort,
-        pub totalhigh: ::c_ulong,
-        pub freehigh: ::c_ulong,
+        pub totalhigh: u64,
+        pub freehigh: u64,
         pub mem_unit: ::c_uint,
         pub _f: [::c_char; 0],
     }
@@ -36,17 +43,16 @@ s! {
         pub msg_stime: ::time_t,
         pub msg_rtime: ::time_t,
         pub msg_ctime: ::time_t,
-        __msg_cbytes: ::c_ulong,
+        __msg_cbytes: u64,
         pub msg_qnum: ::msgqnum_t,
         pub msg_qbytes: ::msglen_t,
         pub msg_lspid: ::pid_t,
         pub msg_lrpid: ::pid_t,
-        __glibc_reserved4: ::c_ulong,
-        __glibc_reserved5: ::c_ulong,
+        __glibc_reserved4: u64,
+        __glibc_reserved5: u64,
     }
 }
 
-pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
 pub const __SIZEOF_PTHREAD_RWLOCKATTR_T: usize = 8;
 
 pub const O_LARGEFILE: ::c_int = 0;
@@ -64,6 +70,15 @@ cfg_if! {
     } else if #[cfg(any(target_arch = "x86_64"))] {
         mod x86_64;
         pub use self::x86_64::*;
+        cfg_if! {
+            if #[cfg(target_pointer_width = "32")] {
+                mod x32;
+                pub use self::x32::*;
+            } else {
+                mod not_x32;
+                pub use self::not_x32::*;
+            }
+        }
     } else {
         // Unknown target_arch
     }
-- 
cgit v1.2.1