Fix dev_t, ino64_t, off64_t, blkcnt64_t definitions for emscripten

Author: malbarbo

src/unix/notbsd/linux/mips/mod.rs

@@ -1,4 +1,8 @@
 pub type loff_t = ::c_longlong;
+pub type dev_t = u64;
+pub type ino64_t = u64;
+pub type off64_t = i64;
+pub type blkcnt64_t = i64;
 
 pub const CLONE_NEWCGROUP: ::c_int = 0x02000000;
 

src/unix/notbsd/linux/mod.rs

@@ -3,13 +3,9 @@
 use dox::{mem, Option};
 
 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;
-pub type blkcnt64_t = i64;
 pub type rlim64_t = u64;
 pub type shmatt_t = ::c_ulong;
 pub type mqd_t = ::c_int;
@@ -743,32 +739,54 @@ f! {
         set1.bits == set2.bits
     }
 
-    pub fn major(dev: ::dev_t) -> ::c_uint {
-        let mut major = 0;
-        major |= (dev & 0x00000000000fff00) >> 8;
-        major |= (dev & 0xfffff00000000000) >> 32;
-        major as ::c_uint
-    }
-
-    pub fn minor(dev: ::dev_t) -> ::c_uint {
-        let mut minor = 0;
-        minor |= (dev & 0xfffff00000000000) >> 0;
-        minor |= (dev & 0x00000ffffff00000) >> 12;
-        minor as ::c_uint
-    }
-
     pub fn makedev(major: ::c_uint, minor: ::c_uint) -> ::dev_t {
         let major = major as ::dev_t;
         let minor = minor as ::dev_t;
         let mut dev = 0;
         dev |= (major & 0x00000fff) << 8;
-        dev |= (major & 0xfffff000) << 32;
+        dev |= (major & 0xfffff000) << 31 << 1; // avoid exceeding_bitshifts
         dev |= (minor & 0x000000ff) << 0;
         dev |= (minor & 0xffffff00) << 12;
         dev
     }
 }
 
+cfg_if! {
+    if #[cfg(target_os = "emscripten")] {
+        f! {
+            pub fn major(dev: ::dev_t) -> ::c_uint {
+                let mut major = 0;
+                major |= (dev & 0x00000fff) >> 8;
+                major |= (dev & 0xfffff000) >> 31 >> 1; // avoid exceeding_bitshifts
+                major as ::c_uint
+            }
+
+            pub fn minor(dev: ::dev_t) -> ::c_uint {
+                let mut minor = 0;
+                minor |= (dev & 0x000000ff) >> 0;
+                minor |= (dev & 0xffffff00) >> 12;
+                minor as ::c_uint
+            }
+        }
+    } else {
+        f! {
+            pub fn major(dev: ::dev_t) -> ::c_uint {
+                let mut major = 0;
+                major |= (dev & 0x00000000000fff00) >> 8;
+                major |= (dev & 0xfffff00000000000) >> 32;
+                major as ::c_uint
+            }
+
+            pub fn minor(dev: ::dev_t) -> ::c_uint {
+                let mut minor = 0;
+                minor |= (dev & 0xfffff00000000000) >> 0;
+                minor |= (dev & 0x00000ffffff00000) >> 12;
+                minor as ::c_uint
+            }
+        }
+    }
+}
+
 extern {
     pub fn aio_read(aiocbp: *mut aiocb) -> ::c_int;
     pub fn aio_write(aiocbp: *mut aiocb) -> ::c_int;

src/unix/notbsd/linux/musl/b32/arm.rs

@@ -7,6 +7,10 @@ pub type blkcnt_t = i64;
 pub type blksize_t = c_long;
 pub type fsblkcnt_t = ::c_ulonglong;
 pub type fsfilcnt_t = ::c_ulonglong;
+pub type dev_t = u64;
+pub type ino64_t = u64;
+pub type off64_t = i64;
+pub type blkcnt64_t = i64;
 
 s! {
     pub struct stat {

src/unix/notbsd/linux/musl/b32/asmjs.rs

@@ -7,6 +7,10 @@ pub type blkcnt_t = i32;
 pub type blksize_t = i32;
 pub type fsblkcnt_t = u32;
 pub type fsfilcnt_t = u32;
+pub type dev_t = u32;
+pub type ino64_t = u32;
+pub type off64_t = i32;
+pub type blkcnt64_t = i32;
 
 s! {
     pub struct stat {

src/unix/notbsd/linux/musl/b32/mips.rs

@@ -7,6 +7,10 @@ pub type blkcnt_t = i64;
 pub type blksize_t = c_long;
 pub type fsblkcnt_t = ::c_ulonglong;
 pub type fsfilcnt_t = ::c_ulonglong;
+pub type dev_t = u64;
+pub type ino64_t = u64;
+pub type off64_t = i64;
+pub type blkcnt64_t = i64;
 
 s! {
     pub struct stat {

src/unix/notbsd/linux/musl/b32/x86.rs

@@ -7,6 +7,10 @@ pub type blkcnt_t = i64;
 pub type blksize_t = c_long;
 pub type fsblkcnt_t = ::c_ulonglong;
 pub type fsfilcnt_t = ::c_ulonglong;
+pub type dev_t = u64;
+pub type ino64_t = u64;
+pub type off64_t = i64;
+pub type blkcnt64_t = i64;
 
 s! {
     pub struct stat {

src/unix/notbsd/linux/musl/b64/mod.rs

@@ -9,6 +9,10 @@ pub type blkcnt_t = i64;
 pub type blksize_t = c_long;
 pub type fsblkcnt_t = ::c_ulonglong;
 pub type fsfilcnt_t = ::c_ulonglong;
+pub type dev_t = u64;
+pub type ino64_t = u64;
+pub type off64_t = i64;
+pub type blkcnt64_t = i64;
 
 s! {
     pub struct stat {

src/unix/notbsd/linux/other/mod.rs

@@ -3,6 +3,10 @@ pub type fsblkcnt_t = ::c_ulong;
 pub type fsfilcnt_t = ::c_ulong;
 pub type rlim_t = c_ulong;
 pub type __priority_which_t = ::c_uint;
+pub type dev_t = u64;
+pub type ino64_t = u64;
+pub type off64_t = i64;
+pub type blkcnt64_t = i64;
 
 s! {
     pub struct aiocb {

src/unix/notbsd/linux/s390x.rs

@@ -17,6 +17,10 @@ pub type greg_t = u64;
 pub type clock_t = i64;
 pub type __fsword_t = ::c_long;
 pub type __priority_which_t = ::c_uint;
+pub type dev_t = u64;
+pub type ino64_t = u64;
+pub type off64_t = i64;
+pub type blkcnt64_t = i64;
 
 s! {
     pub struct aiocb {