From 8c15fb2cea775cb5330d81daf3f80f385e5734ae Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 3 Dec 2025 12:09:42 +0100 Subject: [PATCH] Change type of `AF_INET` and `AF_INET6` to `sa_family_t` --- src/fuchsia/mod.rs | 8 ++++---- src/hermit.rs | 4 ++-- src/unix/aix/mod.rs | 8 ++++---- src/unix/bsd/apple/mod.rs | 8 ++++---- src/unix/bsd/freebsdlike/mod.rs | 8 ++++---- src/unix/bsd/netbsdlike/mod.rs | 8 ++++---- src/unix/cygwin/mod.rs | 8 ++++---- src/unix/haiku/mod.rs | 8 ++++---- src/unix/hurd/mod.rs | 4 ++-- src/unix/linux_like/mod.rs | 8 ++++---- src/unix/newlib/aarch64/mod.rs | 2 +- src/unix/newlib/arm/mod.rs | 2 +- src/unix/newlib/espidf/mod.rs | 2 +- src/unix/newlib/horizon/mod.rs | 2 +- src/unix/newlib/mod.rs | 2 +- src/unix/newlib/vita/mod.rs | 2 +- src/unix/nto/mod.rs | 10 +++++----- src/unix/nuttx/mod.rs | 4 ++-- src/unix/redox/mod.rs | 4 ++-- src/unix/solarish/mod.rs | 8 ++++---- src/vxworks/mod.rs | 8 ++++---- src/wasi/p2.rs | 4 ++-- 22 files changed, 61 insertions(+), 61 deletions(-) diff --git a/src/fuchsia/mod.rs b/src/fuchsia/mod.rs index d02f3f87ae5c5..3d1547e665613 100644 --- a/src/fuchsia/mod.rs +++ b/src/fuchsia/mod.rs @@ -1436,7 +1436,7 @@ pub const SOL_TIPC: c_int = 271; pub const AF_UNSPEC: c_int = 0; pub const AF_UNIX: c_int = 1; pub const AF_LOCAL: c_int = 1; -pub const AF_INET: c_int = 2; +pub const AF_INET: sa_family_t = 2; pub const AF_AX25: c_int = 3; pub const AF_IPX: c_int = 4; pub const AF_APPLETALK: c_int = 5; @@ -1444,7 +1444,7 @@ pub const AF_NETROM: c_int = 6; pub const AF_BRIDGE: c_int = 7; pub const AF_ATMPVC: c_int = 8; pub const AF_X25: c_int = 9; -pub const AF_INET6: c_int = 10; +pub const AF_INET6: sa_family_t = 10; pub const AF_ROSE: c_int = 11; pub const AF_DECnet: c_int = 12; pub const AF_NETBEUI: c_int = 13; @@ -1476,7 +1476,7 @@ pub const AF_ALG: c_int = 38; pub const PF_UNSPEC: c_int = AF_UNSPEC; pub const PF_UNIX: c_int = AF_UNIX; pub const PF_LOCAL: c_int = AF_LOCAL; -pub const PF_INET: c_int = AF_INET; +pub const PF_INET: c_int = AF_INET as _; pub const PF_AX25: c_int = AF_AX25; pub const PF_IPX: c_int = AF_IPX; pub const PF_APPLETALK: c_int = AF_APPLETALK; @@ -1484,7 +1484,7 @@ pub const PF_NETROM: c_int = AF_NETROM; pub const PF_BRIDGE: c_int = AF_BRIDGE; pub const PF_ATMPVC: c_int = AF_ATMPVC; pub const PF_X25: c_int = AF_X25; -pub const PF_INET6: c_int = AF_INET6; +pub const PF_INET6: c_int = AF_INET6 as _; pub const PF_ROSE: c_int = AF_ROSE; pub const PF_DECnet: c_int = AF_DECnet; pub const PF_NETBEUI: c_int = AF_NETBEUI; diff --git a/src/hermit.rs b/src/hermit.rs index e8699228b6001..9bed125e31508 100644 --- a/src/hermit.rs +++ b/src/hermit.rs @@ -115,8 +115,8 @@ s! { } pub const AF_UNSPEC: i32 = 0; -pub const AF_INET: i32 = 3; -pub const AF_INET6: i32 = 1; +pub const AF_INET: sa_family_t = 3; +pub const AF_INET6: sa_family_t = 1; pub const AF_VSOCK: i32 = 2; pub const CLOCK_REALTIME: clockid_t = 1; diff --git a/src/unix/aix/mod.rs b/src/unix/aix/mod.rs index 775061bdbd878..3b057b202bba6 100644 --- a/src/unix/aix/mod.rs +++ b/src/unix/aix/mod.rs @@ -1799,7 +1799,7 @@ pub const SI_MESGQ: c_int = 74; // sys/socket.h pub const AF_UNSPEC: c_int = 0; pub const AF_UNIX: c_int = 1; -pub const AF_INET: c_int = 2; +pub const AF_INET: sa_family_t = 2; pub const AF_IMPLINK: c_int = 3; pub const AF_PUP: c_int = 4; pub const AF_CHAOS: c_int = 5; @@ -1822,14 +1822,14 @@ pub const AF_ISO: c_int = 7; pub const AF_OSI: c_int = AF_ISO; pub const AF_ROUTE: c_int = 17; pub const AF_LINK: c_int = 18; -pub const AF_INET6: c_int = 24; +pub const AF_INET6: sa_family_t = 24; pub const AF_INTF: c_int = 20; pub const AF_RIF: c_int = 21; pub const AF_NDD: c_int = 23; pub const AF_MAX: c_int = 30; pub const PF_UNSPEC: c_int = AF_UNSPEC; pub const PF_UNIX: c_int = AF_UNIX; -pub const PF_INET: c_int = AF_INET; +pub const PF_INET: c_int = AF_INET as _; pub const PF_IMPLINK: c_int = AF_IMPLINK; pub const PF_PUP: c_int = AF_PUP; pub const PF_CHAOS: c_int = AF_CHAOS; @@ -1851,7 +1851,7 @@ pub const PF_XTP: c_int = 19; pub const PF_RIF: c_int = AF_RIF; pub const PF_INTF: c_int = AF_INTF; pub const PF_NDD: c_int = AF_NDD; -pub const PF_INET6: c_int = AF_INET6; +pub const PF_INET6: c_int = AF_INET6 as _; pub const PF_MAX: c_int = AF_MAX; pub const SF_CLOSE: c_int = 1; pub const SF_REUSE: c_int = 2; diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index 7b084251d3b8e..dd845dd0c1670 100644 --- a/src/unix/bsd/apple/mod.rs +++ b/src/unix/bsd/apple/mod.rs @@ -2569,7 +2569,7 @@ pub const IPPROTO_DONE: c_int = 257; pub const AF_UNSPEC: c_int = 0; pub const AF_LOCAL: c_int = 1; pub const AF_UNIX: c_int = AF_LOCAL; -pub const AF_INET: c_int = 2; +pub const AF_INET: crate::sa_family_t = 2; pub const AF_IMPLINK: c_int = 3; pub const AF_PUP: c_int = 4; pub const AF_CHAOS: c_int = 5; @@ -2598,7 +2598,7 @@ pub const AF_NDRV: c_int = 27; pub const AF_ISDN: c_int = 28; pub const AF_E164: c_int = AF_ISDN; pub const pseudo_AF_KEY: c_int = 29; -pub const AF_INET6: c_int = 30; +pub const AF_INET6: crate::sa_family_t = 30; pub const AF_NATM: c_int = 31; pub const AF_SYSTEM: c_uchar = 32; pub const AF_NETBIOS: c_int = 33; @@ -2615,7 +2615,7 @@ pub const SYSPROTO_CONTROL: c_int = 2; pub const PF_UNSPEC: c_int = AF_UNSPEC; pub const PF_LOCAL: c_int = AF_LOCAL; pub const PF_UNIX: c_int = PF_LOCAL; -pub const PF_INET: c_int = AF_INET; +pub const PF_INET: c_int = AF_INET as _; pub const PF_IMPLINK: c_int = AF_IMPLINK; pub const PF_PUP: c_int = AF_PUP; pub const PF_CHAOS: c_int = AF_CHAOS; @@ -2643,7 +2643,7 @@ pub const PF_PIP: c_int = pseudo_AF_PIP; pub const PF_NDRV: c_int = AF_NDRV; pub const PF_ISDN: c_int = AF_ISDN; pub const PF_KEY: c_int = pseudo_AF_KEY; -pub const PF_INET6: c_int = AF_INET6; +pub const PF_INET6: c_int = AF_INET6 as _; pub const PF_NATM: c_int = AF_NATM; pub const PF_SYSTEM: c_int = AF_SYSTEM as c_int; pub const PF_NETBIOS: c_int = AF_NETBIOS; diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs index 30d78f5ff5263..2a603c82d2ca4 100644 --- a/src/unix/bsd/freebsdlike/mod.rs +++ b/src/unix/bsd/freebsdlike/mod.rs @@ -804,7 +804,7 @@ pub const MINCORE_MODIFIED_OTHER: c_int = 0x10; pub const AF_UNSPEC: c_int = 0; pub const AF_LOCAL: c_int = 1; pub const AF_UNIX: c_int = AF_LOCAL; -pub const AF_INET: c_int = 2; +pub const AF_INET: crate::sa_family_t = 2; pub const AF_IMPLINK: c_int = 3; pub const AF_PUP: c_int = 4; pub const AF_CHAOS: c_int = 5; @@ -832,7 +832,7 @@ pub const pseudo_AF_PIP: c_int = 25; pub const AF_ISDN: c_int = 26; pub const AF_E164: c_int = AF_ISDN; pub const pseudo_AF_KEY: c_int = 27; -pub const AF_INET6: c_int = 28; +pub const AF_INET6: crate::sa_family_t = 28; pub const AF_NATM: c_int = 29; pub const AF_ATM: c_int = 30; pub const pseudo_AF_HDRCMPLT: c_int = 31; @@ -841,7 +841,7 @@ pub const AF_NETGRAPH: c_int = 32; pub const PF_UNSPEC: c_int = AF_UNSPEC; pub const PF_LOCAL: c_int = AF_LOCAL; pub const PF_UNIX: c_int = PF_LOCAL; -pub const PF_INET: c_int = AF_INET; +pub const PF_INET: c_int = AF_INET as _; pub const PF_IMPLINK: c_int = AF_IMPLINK; pub const PF_PUP: c_int = AF_PUP; pub const PF_CHAOS: c_int = AF_CHAOS; @@ -868,7 +868,7 @@ pub const PF_RTIP: c_int = pseudo_AF_RTIP; pub const PF_PIP: c_int = pseudo_AF_PIP; pub const PF_ISDN: c_int = AF_ISDN; pub const PF_KEY: c_int = pseudo_AF_KEY; -pub const PF_INET6: c_int = AF_INET6; +pub const PF_INET6: c_int = AF_INET6 as _; pub const PF_NATM: c_int = AF_NATM; pub const PF_ATM: c_int = AF_ATM; pub const PF_NETGRAPH: c_int = AF_NETGRAPH; diff --git a/src/unix/bsd/netbsdlike/mod.rs b/src/unix/bsd/netbsdlike/mod.rs index 557199dc75a87..28ddc707424e1 100644 --- a/src/unix/bsd/netbsdlike/mod.rs +++ b/src/unix/bsd/netbsdlike/mod.rs @@ -439,7 +439,7 @@ pub const fn _IOWR(g: c_ulong, n: c_ulong) -> c_ulong { pub const AF_UNSPEC: c_int = 0; pub const AF_LOCAL: c_int = 1; pub const AF_UNIX: c_int = AF_LOCAL; -pub const AF_INET: c_int = 2; +pub const AF_INET: crate::sa_family_t = 2; pub const AF_IMPLINK: c_int = 3; pub const AF_PUP: c_int = 4; pub const AF_CHAOS: c_int = 5; @@ -460,7 +460,7 @@ pub const AF_COIP: c_int = 20; pub const AF_CNT: c_int = 21; pub const pseudo_AF_RTIP: c_int = 22; pub const AF_IPX: c_int = 23; -pub const AF_INET6: c_int = 24; +pub const AF_INET6: crate::sa_family_t = 24; pub const pseudo_AF_PIP: c_int = 25; pub const AF_ISDN: c_int = 26; pub const AF_E164: c_int = AF_ISDN; @@ -469,7 +469,7 @@ pub const AF_NATM: c_int = 27; pub const PF_UNSPEC: c_int = AF_UNSPEC; pub const PF_LOCAL: c_int = AF_LOCAL; pub const PF_UNIX: c_int = PF_LOCAL; -pub const PF_INET: c_int = AF_INET; +pub const PF_INET: c_int = AF_INET as _; pub const PF_IMPLINK: c_int = AF_IMPLINK; pub const PF_PUP: c_int = AF_PUP; pub const PF_CHAOS: c_int = AF_CHAOS; @@ -489,7 +489,7 @@ pub const PF_XTP: c_int = pseudo_AF_XTP; pub const PF_COIP: c_int = AF_COIP; pub const PF_CNT: c_int = AF_CNT; pub const PF_IPX: c_int = AF_IPX; -pub const PF_INET6: c_int = AF_INET6; +pub const PF_INET6: c_int = AF_INET6 as _; pub const PF_RTIP: c_int = pseudo_AF_RTIP; pub const PF_PIP: c_int = pseudo_AF_PIP; pub const PF_ISDN: c_int = AF_ISDN; diff --git a/src/unix/cygwin/mod.rs b/src/unix/cygwin/mod.rs index 9d3a3b55cfeae..d9ef9b7e4df13 100644 --- a/src/unix/cygwin/mod.rs +++ b/src/unix/cygwin/mod.rs @@ -740,7 +740,7 @@ pub const SOCK_CLOEXEC: c_int = 0x02000000; pub const AF_UNSPEC: c_int = 0; pub const AF_LOCAL: c_int = 1; pub const AF_UNIX: c_int = AF_LOCAL; -pub const AF_INET: c_int = 2; +pub const AF_INET: crate::sa_family_t = 2; pub const AF_IMPLINK: c_int = 3; pub const AF_PUP: c_int = 4; pub const AF_CHAOS: c_int = 5; @@ -757,11 +757,11 @@ pub const AF_LAT: c_int = 14; pub const AF_HYLINK: c_int = 15; pub const AF_APPLETALK: c_int = 16; pub const AF_NETBIOS: c_int = 17; -pub const AF_INET6: c_int = 23; +pub const AF_INET6: crate::sa_family_t = 23; pub const PF_UNSPEC: c_int = AF_UNSPEC; pub const PF_LOCAL: c_int = AF_LOCAL; pub const PF_UNIX: c_int = PF_LOCAL; -pub const PF_INET: c_int = AF_INET; +pub const PF_INET: c_int = AF_INET as _; pub const PF_IMPLINK: c_int = AF_IMPLINK; pub const PF_PUP: c_int = AF_PUP; pub const PF_CHAOS: c_int = AF_CHAOS; @@ -777,7 +777,7 @@ pub const PF_LAT: c_int = AF_LAT; pub const PF_HYLINK: c_int = AF_HYLINK; pub const PF_APPLETALK: c_int = AF_APPLETALK; pub const PF_NETBIOS: c_int = AF_NETBIOS; -pub const PF_INET6: c_int = AF_INET6; +pub const PF_INET6: c_int = AF_INET6 as _; pub const SOMAXCONN: c_int = 0x7fffffff; pub const MSG_OOB: c_int = 0x1; pub const MSG_PEEK: c_int = 0x2; diff --git a/src/unix/haiku/mod.rs b/src/unix/haiku/mod.rs index c1259fe6e0c97..04bdb81e73c9a 100644 --- a/src/unix/haiku/mod.rs +++ b/src/unix/haiku/mod.rs @@ -814,11 +814,11 @@ pub const IFF_CONFIGURING: c_int = 0x4000; pub const IFF_MULTICAST: c_int = 0x8000; // supports multicast pub const AF_UNSPEC: c_int = 0; -pub const AF_INET: c_int = 1; +pub const AF_INET: crate::sa_family_t = 1; pub const AF_APPLETALK: c_int = 2; pub const AF_ROUTE: c_int = 3; pub const AF_LINK: c_int = 4; -pub const AF_INET6: c_int = 5; +pub const AF_INET6: crate::sa_family_t = 5; pub const AF_DLI: c_int = 6; pub const AF_IPX: c_int = 7; pub const AF_NOTIFY: c_int = 8; @@ -827,10 +827,10 @@ pub const AF_UNIX: c_int = AF_LOCAL; pub const AF_BLUETOOTH: c_int = 10; pub const PF_UNSPEC: c_int = AF_UNSPEC; -pub const PF_INET: c_int = AF_INET; +pub const PF_INET: c_int = AF_INET as _; pub const PF_ROUTE: c_int = AF_ROUTE; pub const PF_LINK: c_int = AF_LINK; -pub const PF_INET6: c_int = AF_INET6; +pub const PF_INET6: c_int = AF_INET6 as _; pub const PF_LOCAL: c_int = AF_LOCAL; pub const PF_UNIX: c_int = AF_UNIX; pub const PF_BLUETOOTH: c_int = AF_BLUETOOTH; diff --git a/src/unix/hurd/mod.rs b/src/unix/hurd/mod.rs index 3f2e3dd65b7f2..2bcd46451ad04 100644 --- a/src/unix/hurd/mod.rs +++ b/src/unix/hurd/mod.rs @@ -1234,7 +1234,7 @@ pub const AF_UNSPEC: c_int = 0; pub const AF_LOCAL: c_int = 1; pub const AF_UNIX: c_int = 1; pub const AF_FILE: c_int = 1; -pub const AF_INET: c_int = 2; +pub const AF_INET: sa_family_t = 2; pub const AF_IMPLINK: c_int = 3; pub const AF_PUP: c_int = 4; pub const AF_CHAOS: c_int = 5; @@ -1258,7 +1258,7 @@ pub const pseudo_AF_RTIP: c_int = 22; pub const AF_IPX: c_int = 23; pub const AF_SIP: c_int = 24; pub const pseudo_AF_PIP: c_int = 25; -pub const AF_INET6: c_int = 26; +pub const AF_INET6: sa_family_t = 26; pub const AF_MAX: c_int = 27; pub const SOMAXCONN: c_int = 4096; pub const _SS_SIZE: usize = 128; diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs index dfa62533dfb0c..98e2871e81fcf 100644 --- a/src/unix/linux_like/mod.rs +++ b/src/unix/linux_like/mod.rs @@ -670,7 +670,7 @@ pub const SOL_ALG: c_int = 279; pub const AF_UNSPEC: c_int = 0; pub const AF_UNIX: c_int = 1; pub const AF_LOCAL: c_int = 1; -pub const AF_INET: c_int = 2; +pub const AF_INET: sa_family_t = 2; pub const AF_AX25: c_int = 3; pub const AF_IPX: c_int = 4; pub const AF_APPLETALK: c_int = 5; @@ -678,7 +678,7 @@ pub const AF_NETROM: c_int = 6; pub const AF_BRIDGE: c_int = 7; pub const AF_ATMPVC: c_int = 8; pub const AF_X25: c_int = 9; -pub const AF_INET6: c_int = 10; +pub const AF_INET6: sa_family_t = 10; pub const AF_ROSE: c_int = 11; pub const AF_DECnet: c_int = 12; pub const AF_NETBEUI: c_int = 13; @@ -710,7 +710,7 @@ pub const AF_ALG: c_int = 38; pub const PF_UNSPEC: c_int = AF_UNSPEC; pub const PF_UNIX: c_int = AF_UNIX; pub const PF_LOCAL: c_int = AF_LOCAL; -pub const PF_INET: c_int = AF_INET; +pub const PF_INET: c_int = AF_INET as _; pub const PF_AX25: c_int = AF_AX25; pub const PF_IPX: c_int = AF_IPX; pub const PF_APPLETALK: c_int = AF_APPLETALK; @@ -718,7 +718,7 @@ pub const PF_NETROM: c_int = AF_NETROM; pub const PF_BRIDGE: c_int = AF_BRIDGE; pub const PF_ATMPVC: c_int = AF_ATMPVC; pub const PF_X25: c_int = AF_X25; -pub const PF_INET6: c_int = AF_INET6; +pub const PF_INET6: c_int = AF_INET6 as _; pub const PF_ROSE: c_int = AF_ROSE; pub const PF_DECnet: c_int = AF_DECnet; pub const PF_NETBEUI: c_int = AF_NETBEUI; diff --git a/src/unix/newlib/aarch64/mod.rs b/src/unix/newlib/aarch64/mod.rs index 56c268fc5f2bb..5654c47c9f1e0 100644 --- a/src/unix/newlib/aarch64/mod.rs +++ b/src/unix/newlib/aarch64/mod.rs @@ -28,7 +28,7 @@ s! { } } -pub const AF_INET6: c_int = 23; +pub const AF_INET6: crate::sa_family_t = 23; pub const FIONBIO: c_ulong = 1; diff --git a/src/unix/newlib/arm/mod.rs b/src/unix/newlib/arm/mod.rs index 26f3d52436b84..556b6eeb8e3df 100644 --- a/src/unix/newlib/arm/mod.rs +++ b/src/unix/newlib/arm/mod.rs @@ -30,7 +30,7 @@ s! { } } -pub const AF_INET6: c_int = 23; +pub const AF_INET6: crate::sa_family_t = 23; pub const FIONBIO: c_ulong = 1; diff --git a/src/unix/newlib/espidf/mod.rs b/src/unix/newlib/espidf/mod.rs index 9bec89a7d78d4..525dd0ea672f3 100644 --- a/src/unix/newlib/espidf/mod.rs +++ b/src/unix/newlib/espidf/mod.rs @@ -58,7 +58,7 @@ s! { } pub const AF_UNIX: c_int = 1; -pub const AF_INET6: c_int = 10; +pub const AF_INET6: crate::sa_family_t = 10; pub const FIONBIO: c_ulong = 2147772030; diff --git a/src/unix/newlib/horizon/mod.rs b/src/unix/newlib/horizon/mod.rs index 3958e02734ada..08eee5dfba079 100644 --- a/src/unix/newlib/horizon/mod.rs +++ b/src/unix/newlib/horizon/mod.rs @@ -169,7 +169,7 @@ pub const EAI_OVERFLOW: c_int = 14; pub const EAI_MAX: c_int = 15; pub const AF_UNIX: c_int = 1; -pub const AF_INET6: c_int = 23; +pub const AF_INET6: crate::sa_family_t = 23; pub const FIONBIO: c_ulong = 1; diff --git a/src/unix/newlib/mod.rs b/src/unix/newlib/mod.rs index 0deff9db71ccd..6e34ccd2e9932 100644 --- a/src/unix/newlib/mod.rs +++ b/src/unix/newlib/mod.rs @@ -601,7 +601,7 @@ cfg_if! { } pub const AF_UNSPEC: c_int = 0; -pub const AF_INET: c_int = 2; +pub const AF_INET: sa_family_t = 2; pub const CLOCK_REALTIME: crate::clockid_t = 1; pub const CLOCK_MONOTONIC: crate::clockid_t = 4; diff --git a/src/unix/newlib/vita/mod.rs b/src/unix/newlib/vita/mod.rs index 2a456f47363d9..0547e7357c856 100644 --- a/src/unix/newlib/vita/mod.rs +++ b/src/unix/newlib/vita/mod.rs @@ -87,7 +87,7 @@ s! { } pub const AF_UNIX: c_int = 1; -pub const AF_INET6: c_int = 24; +pub const AF_INET6: crate::sa_family_t = 24; pub const SOCK_RAW: c_int = 3; pub const SOCK_RDM: c_int = 4; diff --git a/src/unix/nto/mod.rs b/src/unix/nto/mod.rs index 60202cddd7b9a..cd8bad0f9e4c8 100644 --- a/src/unix/nto/mod.rs +++ b/src/unix/nto/mod.rs @@ -880,7 +880,7 @@ cfg_if! { if #[cfg(not(target_env = "nto71_iosock"))] { pub const SCM_CREDS: c_int = 0x04; pub const IFF_NOTRAILERS: c_int = 0x00000020; - pub const AF_INET6: c_int = 24; + pub const AF_INET6: sa_family_t = 24; pub const AF_BLUETOOTH: c_int = 31; pub const pseudo_AF_KEY: c_int = 29; pub const MSG_NOSIGNAL: c_int = 0x0800; @@ -954,7 +954,7 @@ cfg_if! { pub const SO_OVERFLOWED: c_int = 0x1009; } else { pub const SCM_CREDS: c_int = 0x03; - pub const AF_INET6: c_int = 28; + pub const AF_INET6: sa_family_t = 28; pub const AF_BLUETOOTH: c_int = 36; pub const pseudo_AF_KEY: c_int = 27; pub const MSG_NOSIGNAL: c_int = 0x20000; @@ -1009,7 +1009,7 @@ pub const IFF_MULTICAST: c_int = 0x00008000; pub const AF_UNSPEC: c_int = 0; pub const AF_UNIX: c_int = AF_LOCAL; pub const AF_LOCAL: c_int = 1; -pub const AF_INET: c_int = 2; +pub const AF_INET: sa_family_t = 2; pub const AF_IPX: c_int = 23; pub const AF_APPLETALK: c_int = 16; pub const AF_ROUTE: c_int = 17; @@ -1020,10 +1020,10 @@ pub const AF_ISDN: c_int = 26; pub const PF_UNSPEC: c_int = AF_UNSPEC; pub const PF_UNIX: c_int = PF_LOCAL; pub const PF_LOCAL: c_int = AF_LOCAL; -pub const PF_INET: c_int = AF_INET; +pub const PF_INET: c_int = AF_INET as _; pub const PF_IPX: c_int = AF_IPX; pub const PF_APPLETALK: c_int = AF_APPLETALK; -pub const PF_INET6: c_int = AF_INET6; +pub const PF_INET6: c_int = AF_INET6 as _; pub const PF_KEY: c_int = pseudo_AF_KEY; pub const PF_ROUTE: c_int = AF_ROUTE; pub const PF_SNA: c_int = AF_SNA; diff --git a/src/unix/nuttx/mod.rs b/src/unix/nuttx/mod.rs index e3ad7bafd153c..680677a943305 100644 --- a/src/unix/nuttx/mod.rs +++ b/src/unix/nuttx/mod.rs @@ -487,8 +487,8 @@ pub const POLLNVAL: i16 = 0x20; pub const AF_UNIX: i32 = 1; pub const SOCK_DGRAM: i32 = 2; pub const SOCK_STREAM: i32 = 1; -pub const AF_INET: i32 = 2; -pub const AF_INET6: i32 = 10; +pub const AF_INET: sa_family_t = 2; +pub const AF_INET6: sa_family_t = 10; pub const MSG_PEEK: i32 = 0x02; pub const SOL_SOCKET: i32 = 1; pub const SHUT_WR: i32 = 2; diff --git a/src/unix/redox/mod.rs b/src/unix/redox/mod.rs index 6dc5fcc1198ed..ed934f346b3a2 100644 --- a/src/unix/redox/mod.rs +++ b/src/unix/redox/mod.rs @@ -790,8 +790,8 @@ pub const RUSAGE_THREAD: c_int = 1; pub const FD_SETSIZE: c_int = 1024; // sys/socket.h -pub const AF_INET: c_int = 2; -pub const AF_INET6: c_int = 10; +pub const AF_INET: sa_family_t = 2; +pub const AF_INET6: sa_family_t = 10; pub const AF_UNIX: c_int = 1; pub const AF_UNSPEC: c_int = 0; pub const PF_INET: c_int = 2; diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs index 963246732c437..3b05fc2c16af9 100644 --- a/src/unix/solarish/mod.rs +++ b/src/unix/solarish/mod.rs @@ -1344,7 +1344,7 @@ pub const MADV_ACCESS_MANY: c_int = 8; pub const AF_UNSPEC: c_int = 0; pub const AF_UNIX: c_int = 1; -pub const AF_INET: c_int = 2; +pub const AF_INET: sa_family_t = 2; pub const AF_IMPLINK: c_int = 3; pub const AF_PUP: c_int = 4; pub const AF_CHAOS: c_int = 5; @@ -1368,7 +1368,7 @@ pub const AF_GOSIP: c_int = 22; pub const AF_IPX: c_int = 23; pub const AF_ROUTE: c_int = 24; pub const AF_LINK: c_int = 25; -pub const AF_INET6: c_int = 26; +pub const AF_INET6: sa_family_t = 26; pub const AF_KEY: c_int = 27; pub const AF_POLICY: c_int = 29; pub const AF_INET_OFFLOAD: c_int = 30; @@ -1379,7 +1379,7 @@ pub const PF_UNSPEC: c_int = AF_UNSPEC; pub const PF_UNIX: c_int = AF_UNIX; pub const PF_LOCAL: c_int = PF_UNIX; pub const PF_FILE: c_int = PF_UNIX; -pub const PF_INET: c_int = AF_INET; +pub const PF_INET: c_int = AF_INET as _; pub const PF_IMPLINK: c_int = AF_IMPLINK; pub const PF_PUP: c_int = AF_PUP; pub const PF_CHAOS: c_int = AF_CHAOS; @@ -1403,7 +1403,7 @@ pub const PF_GOSIP: c_int = AF_GOSIP; pub const PF_IPX: c_int = AF_IPX; pub const PF_ROUTE: c_int = AF_ROUTE; pub const PF_LINK: c_int = AF_LINK; -pub const PF_INET6: c_int = AF_INET6; +pub const PF_INET6: c_int = AF_INET6 as _; pub const PF_KEY: c_int = AF_KEY; pub const PF_POLICY: c_int = AF_POLICY; pub const PF_INET_OFFLOAD: c_int = AF_INET_OFFLOAD; diff --git a/src/vxworks/mod.rs b/src/vxworks/mod.rs index ad1b0f9d09815..af6a025d8354b 100644 --- a/src/vxworks/mod.rs +++ b/src/vxworks/mod.rs @@ -1011,16 +1011,16 @@ pub const PF_LOCAL: c_int = AF_LOCAL; pub const PF_UNIX: c_int = PF_LOCAL; pub const PF_UNSPEC: c_int = AF_UNSPEC; pub const AF_UNIX: c_int = AF_LOCAL; -pub const AF_INET: c_int = 2; -pub const PF_INET: c_int = AF_INET; +pub const AF_INET: sa_family_t = 2; +pub const PF_INET: c_int = AF_INET as _; pub const AF_NETLINK: c_int = 16; pub const AF_ROUTE: c_int = 17; pub const AF_LINK: c_int = 18; pub const AF_PACKET: c_int = 19; pub const pseudo_AF_KEY: c_int = 27; pub const AF_KEY: c_int = pseudo_AF_KEY; -pub const AF_INET6: c_int = 28; -pub const PF_INET6: c_int = AF_INET6; +pub const AF_INET6: sa_family_t = 28; +pub const PF_INET6: c_int = AF_INET6 as _; pub const AF_SOCKDEV: c_int = 31; pub const AF_TIPC: c_int = 33; pub const AF_MIPC: c_int = 34; diff --git a/src/wasi/p2.rs b/src/wasi/p2.rs index 7332a779396d3..50d84a8c1a366 100644 --- a/src/wasi/p2.rs +++ b/src/wasi/p2.rs @@ -99,8 +99,8 @@ pub const SOCK_NONBLOCK: c_int = 0x00004000; pub const SOL_SOCKET: c_int = 0x7fffffff; pub const AF_UNSPEC: c_int = 0; -pub const AF_INET: c_int = 1; -pub const AF_INET6: c_int = 2; +pub const AF_INET: sa_family_t = 1; +pub const AF_INET6: sa_family_t = 2; pub const IPPROTO_IP: c_int = 0; pub const IPPROTO_TCP: c_int = 6;