diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-02-25 00:23:50 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-02-25 00:23:50 +0100 |
| commit | fe499944e7bff06202cf0d5f08761539cefaa65b (patch) | |
| tree | 110724556e966e982bb746b8b6db8b0418609b8b | |
| parent | 69ae346034df5d44a9e3d2c2ed72784bdf3b297c (diff) | |
| download | rust-libc-fe499944e7bff06202cf0d5f08761539cefaa65b.tar.gz | |
Move non-musl GENL_ constants to correct submodules
| -rw-r--r-- | src/unix/notbsd/linux/mips/mod.rs | 5 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/mod.rs | 13 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/other/mod.rs | 5 |
3 files changed, 10 insertions, 13 deletions
diff --git a/src/unix/notbsd/linux/mips/mod.rs b/src/unix/notbsd/linux/mips/mod.rs index d409381903..ac4f3b4211 100644 --- a/src/unix/notbsd/linux/mips/mod.rs +++ b/src/unix/notbsd/linux/mips/mod.rs @@ -702,6 +702,11 @@ pub const EPOLLWAKEUP: ::c_int = 0x20000000; pub const NLA_ALIGNTO: ::c_int = 4; +pub const GENL_UNS_ADMIN_PERM: ::c_int = 0x10; + +pub const GENL_ID_VFS_DQUOT: ::c_int = ::NLMSG_MIN_TYPE + 1; +pub const GENL_ID_PMCRAID: ::c_int = ::NLMSG_MIN_TYPE + 2; + pub const NFT_TABLE_MAXNAMELEN: ::c_int = 32; pub const NFT_CHAIN_MAXNAMELEN: ::c_int = 32; pub const NFT_SET_MAXNAMELEN: ::c_int = 32; diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs index 20f88e574c..25f7ed3b4a 100644 --- a/src/unix/notbsd/linux/mod.rs +++ b/src/unix/notbsd/linux/mod.rs @@ -1285,21 +1285,8 @@ pub const GENL_ADMIN_PERM: ::c_int = 0x01; pub const GENL_CMD_CAP_DO: ::c_int = 0x02; pub const GENL_CMD_CAP_DUMP: ::c_int = 0x04; pub const GENL_CMD_CAP_HASPOL: ::c_int = 0x08; -cfg_if! { - if #[cfg(not(target_env = "musl"))] { - pub const GENL_UNS_ADMIN_PERM: ::c_int = 0x10; - } else { - } -} pub const GENL_ID_CTRL: ::c_int = NLMSG_MIN_TYPE; -cfg_if! { - if #[cfg(not(target_env = "musl"))] { - pub const GENL_ID_VFS_DQUOT: ::c_int = NLMSG_MIN_TYPE + 1; - pub const GENL_ID_PMCRAID: ::c_int = NLMSG_MIN_TYPE + 2; - } else { - } -} pub const CTRL_CMD_UNSPEC: ::c_int = 0; pub const CTRL_CMD_NEWFAMILY: ::c_int = 1; diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs index 2083705332..ab3b7cfa3c 100644 --- a/src/unix/notbsd/linux/other/mod.rs +++ b/src/unix/notbsd/linux/other/mod.rs @@ -572,6 +572,11 @@ pub const NLA_TYPE_MASK: ::c_int = !(NLA_F_NESTED | NLA_F_NET_BYTEORDER); pub const NLA_ALIGNTO: ::c_int = 4; +pub const GENL_UNS_ADMIN_PERM: ::c_int = 0x10; + +pub const GENL_ID_VFS_DQUOT: ::c_int = ::NLMSG_MIN_TYPE + 1; +pub const GENL_ID_PMCRAID: ::c_int = ::NLMSG_MIN_TYPE + 2; + pub const TIOCM_LE: ::c_int = 0x001; pub const TIOCM_DTR: ::c_int = 0x002; pub const TIOCM_RTS: ::c_int = 0x004; |