Handle unions in the s macro

Author: gnzlbg

src/macros.rs

@@ -36,16 +36,33 @@ macro_rules! __cfg_if_apply {
 
 macro_rules! s {
     ($($(#[$attr:meta])* pub $t:ident $i:ident { $($field:tt)* })*) => ($(
+        s!(it: $(#[$attr])* pub $t $i { $($field)* });
+    )*);
+    (it: $(#[$attr:meta])* pub struct $i:ident { $($field:tt)* }) => (
         __item! {
             #[repr(C)]
             $(#[$attr])*
-            pub $t $i { $($field)* }
+                pub struct $i { $($field)* }
         }
         impl ::dox::Copy for $i {}
         impl ::dox::Clone for $i {
             fn clone(&self) -> $i { *self }
         }
-    )*)
+    );
+    (it: $(#[$attr:meta])* pub union $i:ident { $($field:tt)* }) => (
+        __item! {
+            #[cfg(libc_union)]
+            #[repr(C)]
+            $(#[$attr])*
+            pub struct $i { $($field)* }
+        }
+        #[cfg(libc_union)]
+        impl ::dox::Copy for $i {}
+        #[cfg(libc_union)]
+        impl ::dox::Clone for $i {
+            fn clone(&self) -> $i { *self }
+        }
+    );
 }
 
 #[allow(unused_macros)]

src/unix/bsd/apple/mod.rs

@@ -557,6 +557,12 @@ s! {
         pub sem_pad3: [::int32_t; 4],
     }
 
+    pub union semun {
+        pub val: ::c_int,
+        pub buf: *mut semid_ds,
+        pub array: *mut ::c_ushort,
+    }
+
     // sys/shm.h
 
     #[cfg_attr(feature = "rustc-dep-of-std", repr(packed(4)))]
@@ -583,15 +589,6 @@ s! {
     }
 }
 
-#[cfg(libc_union)]
-s! {
-    pub union semun {
-        pub val: ::c_int,
-        pub buf: *mut semid_ds,
-        pub array: *mut ::c_ushort,
-    }
-}
-
 pub const _UTX_USERSIZE: usize = 256;
 pub const _UTX_LINESIZE: usize = 32;
 pub const _UTX_IDSIZE: usize = 4;