Auto merge of #1237 - strangelittlemonkey:fix_dragonfly_casting, r=gnzlbg

Fix dragonfly casting

This fixes a recent break in the casting on DragonFly and also a separate commit to bring the newer code into the same style with rustfmt.

fixes #1238

Author: bors

src/unix/bsd/freebsdlike/dragonfly/mod.rs

@@ -25,6 +25,8 @@ impl ::dox::Clone for sem {
     fn clone(&self) -> sem { *self }
 }
 
+use dox::mem;
+
 s! {
 
     pub struct exit_status {
@@ -805,25 +807,25 @@ f! {
     }
 
     pub fn CMSG_LEN(length: ::c_uint) -> ::c_uint {
-        _CMSG_ALIGN(mem::size_of::<::cmsghdr>()) + length as usize
+       (_CMSG_ALIGN(mem::size_of::<::cmsghdr>()) + length as usize) as u32
     }
 
     pub fn CMSG_NXTHDR(mhdr: *const ::msghdr, cmsg: *const ::cmsghdr)
         -> *mut ::cmsghdr
     {
-        let next = cmsg as usize + _CMSG_ALIGN((*cmsg).cmsg_len)
+        let next = cmsg as usize + _CMSG_ALIGN((*cmsg).cmsg_len as usize)
             + _CMSG_ALIGN(mem::size_of::<::cmsghdr>());
         let max = (*mhdr).msg_control as usize
             + (*mhdr).msg_controllen as usize;
         if next <= max {
-            (cmsg as usize + _CMSG_ALIGN((*cmsg).cmsg_len)) as *mut ::cmsghdr
+            (cmsg as usize + _CMSG_ALIGN((*cmsg).cmsg_len as usize)) as *mut ::cmsghdr
         } else {
             0 as *mut ::cmsghdr
         }
     }
 
     pub fn CMSG_SPACE(length: ::c_uint) -> ::c_uint {
-        _CMSG_ALIGN(mem::size_of::<::cmsghdr>()) + _CMSG_ALIGN(length as usize)
+        (_CMSG_ALIGN(mem::size_of::<::cmsghdr>()) + _CMSG_ALIGN(length as usize)) as u32
     }
 }