From 74c554c39545ed4642a1e93a0bb9ee7d7ee3883a Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <copypaste@kittens.ph>
Date: Sat, 3 Mar 2018 11:26:40 +0000
Subject: [PATCH] Fix build error on stable Rust
---
src/unix/bsd/mod.rs | 8 +-------
src/unix/notbsd/linux/mod.rs | 8 +-------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs
index 592e0643..c7f670aa 100644
--- a/src/unix/bsd/mod.rs
+++ b/src/unix/bsd/mod.rs
@@ -1,4 +1,5 @@
use dox::{mem, Option};
+use unix::group;
pub type wchar_t = i32;
pub type off_t = i64;
@@ -50,13 +51,6 @@ s! {
pub pw_fields: ::c_int,
}
- pub struct group {
- pub gr_name: *mut ::c_char,
- pub gr_passwd: *mut ::c_char,
- pub gr_gid: ::gid_t,
- pub gr_mem: *mut *mut ::c_char
- }
-
pub struct ifaddrs {
pub ifa_next: *mut ifaddrs,
pub ifa_name: *mut ::c_char,
diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs
index 729eb312..9f4307d8 100644
--- a/src/unix/notbsd/linux/mod.rs
+++ b/src/unix/notbsd/linux/mod.rs
@@ -1,6 +1,7 @@
//! Linux-specific definitions for linux-like values
use dox::{mem, Option};
+use unix::group;
pub type useconds_t = u32;
pub type dev_t = u64;
@@ -160,13 +161,6 @@ s! {
pub pw_shell: *mut ::c_char,
}
- pub struct group {
- pub gr_name: *mut ::c_char,
- pub gr_passwd: *mut ::c_char,
- pub gr_gid: ::gid_t,
- pub gr_mem: *mut *mut ::c_char
- }
-
pub struct spwd {
pub sp_namp: *mut ::c_char,
pub sp_pwdp: *mut ::c_char,
--
GitLab