Skip to content

Commit 93b49b1

Browse files
authored
Merge pull request #1833 from kellda/fix-454
FreeBSDLike: Remove obsolete constants in version 1.0.0
2 parents 99248c7 + 5a19c86 commit 93b49b1

File tree

2 files changed

+0
-26
lines changed

2 files changed

+0
-26
lines changed

libc-test/build.rs

-6
Original file line numberDiff line numberDiff line change
@@ -2328,12 +2328,6 @@ fn test_freebsd(target: &str) {
23282328
// still be accepted and ignored at runtime.
23292329
"MAP_RENAME" | "MAP_NORESERVE" => true,
23302330

2331-
// FIXME: These are deprecated - remove in a couple of releases.
2332-
// These constants were removed in FreeBSD 11 (svn r262489),
2333-
// and they've never had any legitimate use outside of the
2334-
// base system anyway.
2335-
"CTL_MAXID" | "KERN_MAXID" | "HW_MAXID" | "USER_MAXID" => true,
2336-
23372331
// FIXME: This is deprecated - remove in a couple of releases.
23382332
// This was removed in FreeBSD 14 (git 1b4701fe1e8) and never
23392333
// should've been used anywhere anyway.

src/unix/bsd/freebsdlike/freebsd/mod.rs

-20
Original file line numberDiff line numberDiff line change
@@ -3857,26 +3857,6 @@ pub const SHM_STAT: ::c_int = 13;
38573857
pub const SHM_INFO: ::c_int = 14;
38583858
pub const SHM_ANON: *mut ::c_char = 1 as *mut ::c_char;
38593859

3860-
// The *_MAXID constants never should've been used outside of the
3861-
// FreeBSD base system. And with the exception of CTL_P1003_1B_MAXID,
3862-
// they were all removed in svn r262489. They remain here for backwards
3863-
// compatibility only, and are scheduled to be removed in libc 1.0.0.
3864-
#[doc(hidden)]
3865-
#[deprecated(since = "0.2.54", note = "Removed in FreeBSD 11")]
3866-
pub const CTL_MAXID: ::c_int = 10;
3867-
#[doc(hidden)]
3868-
#[deprecated(since = "0.2.54", note = "Removed in FreeBSD 11")]
3869-
pub const KERN_MAXID: ::c_int = 38;
3870-
#[doc(hidden)]
3871-
#[deprecated(since = "0.2.54", note = "Removed in FreeBSD 11")]
3872-
pub const HW_MAXID: ::c_int = 13;
3873-
#[doc(hidden)]
3874-
#[deprecated(since = "0.2.54", note = "Removed in FreeBSD 11")]
3875-
pub const USER_MAXID: ::c_int = 21;
3876-
#[doc(hidden)]
3877-
#[deprecated(since = "0.2.74", note = "Removed in FreeBSD 13")]
3878-
pub const CTL_P1003_1B_MAXID: ::c_int = 26;
3879-
38803860
pub const MSG_NOTIFICATION: ::c_int = 0x00002000;
38813861
pub const MSG_NBIO: ::c_int = 0x00004000;
38823862
pub const MSG_COMPAT: ::c_int = 0x00008000;

0 commit comments

Comments
 (0)