Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove AF_MAX, PF_MAX, NET_MAXID constants #1423

Merged
merged 1 commit into from Jul 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 1 addition & 6 deletions libc-test/build.rs
Expand Up @@ -1082,11 +1082,6 @@ fn test_dragonflybsd(target: &str) {
| "PORT_SOURCE_SIGNAL"
| "PTHREAD_STACK_MIN" => true,

// These change all the time from release to release of linux
// distros, let's just not bother trying to verify them. They
// shouldn't be used in code anyway...
"AF_MAX" | "PF_MAX" => true,

_ => false,
}
});
Expand Down Expand Up @@ -1582,7 +1577,7 @@ fn test_freebsd(target: &str) {
// These constants were removed in FreeBSD 11 (svn r262489),
// and they've never had any legitimate use outside of the
// base system anyway.
"CTL_MAXID" | "KERN_MAXID" | "HW_MAXID" | "NET_MAXID"
"CTL_MAXID" | "KERN_MAXID" | "HW_MAXID"
| "USER_MAXID" => true,

_ => false,
Expand Down
16 changes: 0 additions & 16 deletions src/fuchsia/aarch64.rs
Expand Up @@ -64,19 +64,3 @@ s! {

pub const MINSIGSTKSZ: ::size_t = 6144;
pub const SIGSTKSZ: ::size_t = 12288;

#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const PF_MAX: ::c_int = 43;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
#[allow(deprecated)]
pub const AF_MAX: ::c_int = PF_MAX;
16 changes: 0 additions & 16 deletions src/fuchsia/x86_64.rs
Expand Up @@ -150,19 +150,3 @@ pub const MAP_32BIT: ::c_int = 0x0040;

pub const SIGSTKSZ: ::size_t = 8192;
pub const MINSIGSTKSZ: ::size_t = 2048;

#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const AF_MAX: ::c_int = 42;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
#[allow(deprecated)]
pub const PF_MAX: ::c_int = AF_MAX;
24 changes: 0 additions & 24 deletions src/unix/bsd/apple/mod.rs
Expand Up @@ -2110,13 +2110,6 @@ pub const AF_SYSTEM: ::c_int = 32;
pub const AF_NETBIOS: ::c_int = 33;
pub const AF_PPP: ::c_int = 34;
pub const pseudo_AF_HDRCMPLT: ::c_int = 35;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const AF_MAX: ::c_int = 40;
pub const AF_SYS_CONTROL: ::c_int = 2;

pub const SYSPROTO_EVENT: ::c_int = 1;
Expand Down Expand Up @@ -2157,23 +2150,6 @@ pub const PF_NATM: ::c_int = AF_NATM;
pub const PF_SYSTEM: ::c_int = AF_SYSTEM;
pub const PF_NETBIOS: ::c_int = AF_NETBIOS;
pub const PF_PPP: ::c_int = AF_PPP;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
#[allow(deprecated)]
pub const PF_MAX: ::c_int = AF_MAX;

#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
#[allow(deprecated)]
pub const NET_MAXID: ::c_int = AF_MAX;

pub const NET_RT_DUMP: ::c_int = 1;
pub const NET_RT_FLAGS: ::c_int = 2;
Expand Down
24 changes: 0 additions & 24 deletions src/unix/bsd/freebsdlike/dragonfly/mod.rs
Expand Up @@ -917,23 +917,8 @@ pub const TCP_FASTKEEP: ::c_int = 128;
pub const AF_BLUETOOTH: ::c_int = 33;
pub const AF_MPLS: ::c_int = 34;
pub const AF_IEEE80211: ::c_int = 35;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const AF_MAX: ::c_int = 36;

pub const PF_BLUETOOTH: ::c_int = AF_BLUETOOTH;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
#[allow(deprecated)]
pub const PF_MAX: ::c_int = AF_MAX;

pub const NET_RT_DUMP: ::c_int = 1;
pub const NET_RT_FLAGS: ::c_int = 2;
Expand All @@ -942,15 +927,6 @@ pub const NET_RT_MAXID: ::c_int = 4;

pub const SOMAXOPT_SIZE: ::c_int = 65536;

#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
#[allow(deprecated)]
pub const NET_MAXID: ::c_int = AF_MAX;

pub const MSG_UNUSED09: ::c_int = 0x00000200;
pub const MSG_NOSIGNAL: ::c_int = 0x00000400;
pub const MSG_SYNC: ::c_int = 0x00000800;
Expand Down
19 changes: 0 additions & 19 deletions src/unix/bsd/freebsdlike/freebsd/mod.rs
Expand Up @@ -646,13 +646,6 @@ pub const AF_BLUETOOTH: ::c_int = 36;
pub const AF_IEEE80211: ::c_int = 37;
pub const AF_INET_SDP: ::c_int = 40;
pub const AF_INET6_SDP: ::c_int = 42;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const AF_MAX: ::c_int = 42;

// https://github.com/freebsd/freebsd/blob/master/sys/net/if.h#L140
pub const IFF_UP: ::c_int = 0x1; // (n) interface is up
Expand Down Expand Up @@ -959,14 +952,6 @@ pub const PF_BLUETOOTH: ::c_int = AF_BLUETOOTH;
pub const PF_IEEE80211: ::c_int = AF_IEEE80211;
pub const PF_INET_SDP: ::c_int = AF_INET_SDP;
pub const PF_INET6_SDP: ::c_int = AF_INET6_SDP;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
#[allow(deprecated)]
pub const PF_MAX: ::c_int = AF_MAX;

pub const NET_RT_DUMP: ::c_int = 1;
pub const NET_RT_FLAGS: ::c_int = 2;
Expand Down Expand Up @@ -1003,10 +988,6 @@ pub const SHM_ANON: *mut ::c_char = 1 as *mut ::c_char;
// compatibility only, and are scheduled to be removed in libc 1.0.0.
#[doc(hidden)]
#[deprecated(since="0.2.54",note="Removed in FreeBSD 11")]
#[allow(deprecated)]
pub const NET_MAXID: ::c_int = AF_MAX;
#[doc(hidden)]
#[deprecated(since="0.2.54",note="Removed in FreeBSD 11")]
pub const CTL_MAXID: ::c_int = 10;
#[doc(hidden)]
#[deprecated(since="0.2.54",note="Removed in FreeBSD 11")]
Expand Down
25 changes: 0 additions & 25 deletions src/unix/bsd/netbsdlike/netbsd/mod.rs
Expand Up @@ -883,22 +883,6 @@ pub const AF_BLUETOOTH: ::c_int = 31;
pub const AF_IEEE80211: ::c_int = 32;
pub const AF_MPLS: ::c_int = 33;
pub const AF_ROUTE: ::c_int = 34;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const AF_MAX: ::c_int = 36;

#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
#[allow(deprecated)]
pub const NET_MAXID: ::c_int = AF_MAX;
pub const NET_RT_DUMP: ::c_int = 1;
pub const NET_RT_FLAGS: ::c_int = 2;
pub const NET_RT_OOOIFLIST: ::c_int = 3;
Expand All @@ -914,15 +898,6 @@ pub const PF_BLUETOOTH: ::c_int = AF_BLUETOOTH;
pub const PF_MPLS: ::c_int = AF_MPLS;
pub const PF_ROUTE: ::c_int = AF_ROUTE;

#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
#[allow(deprecated)]
pub const PF_MAX: ::c_int = AF_MAX;

pub const MSG_NBIO: ::c_int = 0x1000;
pub const MSG_WAITFORONE: ::c_int = 0x2000;
pub const MSG_NOTIFICATION: ::c_int = 0x4000;
Expand Down
24 changes: 0 additions & 24 deletions src/unix/bsd/netbsdlike/openbsd/mod.rs
Expand Up @@ -834,22 +834,6 @@ pub const AF_BLUETOOTH: ::c_int = 32;
pub const AF_MPLS: ::c_int = 33;
pub const pseudo_AF_PFLOW: ::c_int = 34;
pub const pseudo_AF_PIPEX: ::c_int = 35;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const AF_MAX: ::c_int = 36;

#[doc(hidden)]
#[allow(deprecated)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const NET_MAXID: ::c_int = AF_MAX;
pub const NET_RT_DUMP: ::c_int = 1;
pub const NET_RT_FLAGS: ::c_int = 2;
pub const NET_RT_IFLIST: ::c_int = 3;
Expand All @@ -872,14 +856,6 @@ pub const PF_BLUETOOTH: ::c_int = AF_BLUETOOTH;
pub const PF_MPLS: ::c_int = AF_MPLS;
pub const PF_PFLOW: ::c_int = pseudo_AF_PFLOW;
pub const PF_PIPEX: ::c_int = pseudo_AF_PIPEX;
#[doc(hidden)]
#[allow(deprecated)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const PF_MAX: ::c_int = AF_MAX;

pub const SCM_TIMESTAMP: ::c_int = 0x04;

Expand Down
7 changes: 0 additions & 7 deletions src/unix/haiku/mod.rs
Expand Up @@ -800,13 +800,6 @@ pub const AF_NOTIFY: ::c_int = 8;
pub const AF_LOCAL: ::c_int = 9;
pub const AF_UNIX: ::c_int = AF_LOCAL;
pub const AF_BLUETOOTH: ::c_int = 10;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const AF_MAX: ::c_int = 11;

pub const IP_OPTIONS: ::c_int = 1;
pub const IP_HDRINCL: ::c_int = 2;
Expand Down
16 changes: 0 additions & 16 deletions src/unix/linux_like/android/mod.rs
Expand Up @@ -952,22 +952,6 @@ pub const SOL_ATALK: ::c_int = 258;
pub const SOL_NETROM: ::c_int = 259;
pub const SOL_ROSE: ::c_int = 260;

#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const AF_MAX: ::c_int = 43;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
#[allow(deprecated)]
pub const PF_MAX: ::c_int = AF_MAX;

/* DCCP socket options */
pub const DCCP_SOCKOPT_PACKET_SIZE: ::c_int = 1;
pub const DCCP_SOCKOPT_SERVICE: ::c_int = 2;
Expand Down
15 changes: 0 additions & 15 deletions src/unix/linux_like/emscripten/mod.rs
Expand Up @@ -921,25 +921,10 @@ pub const AF_IB: ::c_int = 27;
pub const AF_MPLS: ::c_int = 28;
pub const AF_NFC: ::c_int = 39;
pub const AF_VSOCK: ::c_int = 40;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const AF_MAX: ::c_int = 42;
pub const PF_IB: ::c_int = AF_IB;
pub const PF_MPLS: ::c_int = AF_MPLS;
pub const PF_NFC: ::c_int = AF_NFC;
pub const PF_VSOCK: ::c_int = AF_VSOCK;
#[doc(hidden)]
#[allow(deprecated)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const PF_MAX: ::c_int = AF_MAX;

// System V IPC
pub const IPC_PRIVATE: ::key_t = 0;
Expand Down
16 changes: 0 additions & 16 deletions src/unix/linux_like/linux/gnu/mod.rs
Expand Up @@ -874,22 +874,6 @@ pub const M_PERTURB: ::c_int = -6;
pub const M_ARENA_TEST: ::c_int = -7;
pub const M_ARENA_MAX: ::c_int = -8;

#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const AF_MAX: ::c_int = 45;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
#[allow(deprecated)]
pub const PF_MAX: ::c_int = AF_MAX;

pub const AT_STATX_SYNC_TYPE: ::c_int = 0x6000;
pub const AT_STATX_SYNC_AS_STAT: ::c_int = 0x0000;
pub const AT_STATX_FORCE_SYNC: ::c_int = 0x2000;
Expand Down
16 changes: 0 additions & 16 deletions src/unix/linux_like/linux/musl/b32/arm.rs
Expand Up @@ -828,22 +828,6 @@ pub const SYS_pkey_mprotect: ::c_long = 394;
pub const SYS_pkey_alloc: ::c_long = 395;
pub const SYS_pkey_free: ::c_long = 396;

#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const AF_MAX: ::c_int = 45;
#[doc(hidden)]
#[allow(deprecated)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const PF_MAX: ::c_int = AF_MAX;

extern {
pub fn getrandom(
buf: *mut ::c_void,
Expand Down
16 changes: 0 additions & 16 deletions src/unix/linux_like/linux/musl/b32/mips.rs
Expand Up @@ -836,19 +836,3 @@ pub const SYS_mlock2: ::c_long = 4000 + 359;
pub const SYS_copy_file_range: ::c_long = 4000 + 360;
pub const SYS_preadv2: ::c_long = 4000 + 361;
pub const SYS_pwritev2: ::c_long = 4000 + 362;

#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
pub const AF_MAX: ::c_int = 42;
#[doc(hidden)]
#[deprecated(
since = "0.2.55",
note = "If you are using this report to: \
https://github.com/rust-lang/libc/issues/665"
)]
#[allow(deprecated)]
pub const PF_MAX: ::c_int = AF_MAX;