From 26ddbc14a86af003d21796a9ca554e45307473d2 Mon Sep 17 00:00:00 2001 From: vasilito Date: Sun, 2 Aug 2026 07:38:11 +0300 Subject: [PATCH] sys_ioctl: drop SIOCGIFADDR/SIOCGIFINDEX duplicates from linux.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are defined in the common constants.rs (used by all targets, including redox). Redefining them in the Linux-only linux.rs makes rustc error on the linux target and — because cbindgen ignores cfg and processes both files — makes header generation fail with 'Conflicting name for constant' on any target, including a clean redox relibc rebuild. Keep the SIOGIFINDEX typo-alias, which references the constants.rs SIOCGIFINDEX. --- src/header/sys_ioctl/linux.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/header/sys_ioctl/linux.rs b/src/header/sys_ioctl/linux.rs index 4484b78818..125479ccf6 100644 --- a/src/header/sys_ioctl/linux.rs +++ b/src/header/sys_ioctl/linux.rs @@ -117,7 +117,6 @@ pub const SIOCGIFCONF: c_ulong = 0x8912; pub const SIOCGIFFLAGS: c_ulong = 0x8913; /// Set the active flag word of the device. pub const SIOCSIFFLAGS: c_ulong = 0x8914; -pub const SIOCGIFADDR: c_ulong = 0x8915; pub const SIOCSIFADDR: c_ulong = 0x8916; pub const SIOCGIFDSTADDR: c_ulong = 0x8917; pub const SIOCSIFDSTADDR: c_ulong = 0x8918; @@ -140,7 +139,6 @@ pub const SIOCGIFSLAVE: c_ulong = 0x8929; pub const SIOCSIFSLAVE: c_ulong = 0x8930; pub const SIOCADDMULTI: c_ulong = 0x8931; pub const SIOCDELMULTI: c_ulong = 0x8932; -pub const SIOCGIFINDEX: c_ulong = 0x8933; pub const SIOGIFINDEX: c_ulong = SIOCGIFINDEX; pub const SIOCSIFPFLAGS: c_ulong = 0x8934; pub const SIOCGIFPFLAGS: c_ulong = 0x8935;