Merge #1505

1505: Fix build for DragonFlyBSD r=asomers a=rtzoeller The build for DragonFlyBSD is currently failing, due to a missing field when initializing `passwd`. Fix warnings due to types being referenced which are marked as deprecated in libc. These constants are unused by DragonFlyBSD and can be removed: rust-lang/libc@e0d27d0 Co-authored-by: Ryan Zoeller <[email protected]>
nix-rust · Aug 27, 2021 · 58e87ca · 58e87ca
2 parents dab7332 + 8366b92
commit 58e87ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/sys/mman.rs b/src/sys/mman.rs
@@ -65,8 +65,8 @@ libc_bitflags!{
         MAP_LOCKED;
         /// Do not reserve swap space for this mapping.
         ///
-        /// This was removed in FreeBSD 11.
-        #[cfg(not(target_os = "freebsd"))]
+        /// This was removed in FreeBSD 11 and is unused in DragonFlyBSD.
+        #[cfg(not(any(target_os = "dragonfly", target_os = "freebsd")))]
         MAP_NORESERVE;
         /// Populate page tables for a mapping.
         #[cfg(any(target_os = "android", target_os = "linux"))]
@@ -122,8 +122,8 @@ libc_bitflags!{
         MAP_NOSYNC;
         /// Rename private pages to a file.
         ///
-        /// This was removed in FreeBSD 11.
-        #[cfg(any(target_os = "dragonfly", target_os = "netbsd", target_os = "openbsd"))]
+        /// This was removed in FreeBSD 11 and is unused in DragonFlyBSD.
+        #[cfg(any(target_os = "netbsd", target_os = "openbsd"))]
         MAP_RENAME;
         /// Region may contain semaphores.
         #[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]

diff --git a/src/unistd.rs b/src/unistd.rs
@@ -2742,7 +2742,7 @@ impl From<User> for libc::passwd {
             pw_age: CString::new("").unwrap().into_raw(),
             #[cfg(target_os = "illumos")]
             pw_comment: CString::new("").unwrap().into_raw(),
-            #[cfg(target_os = "freebsd")]
+            #[cfg(any(target_os = "dragonfly", target_os = "freebsd"))]
             pw_fields: 0,
         }
     }