Skip to content

Commit a9590b5

Browse files
committed
Move mallopt to exclude from musl
1 parent 7192ecb commit a9590b5

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

src/unix/notbsd/linux/mod.rs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,20 +1576,6 @@ pub const ATF_MAGIC: ::c_int = 0x80;
15761576
pub const MODULE_INIT_IGNORE_MODVERSIONS: ::c_uint = 0x0001;
15771577
pub const MODULE_INIT_IGNORE_VERMAGIC: ::c_uint = 0x0002;
15781578

1579-
// malloc.h
1580-
pub const M_MXFAST: ::c_int = 1;
1581-
pub const M_NLBLKS: ::c_int = 2;
1582-
pub const M_GRAIN: ::c_int = 3;
1583-
pub const M_KEEP: ::c_int = 4;
1584-
pub const M_TRIM_THRESHOLD: ::c_int = -1;
1585-
pub const M_TOP_PAD: ::c_int = -2;
1586-
pub const M_MMAP_THRESHOLD: ::c_int = -3;
1587-
pub const M_MMAP_MAX: ::c_int = -4;
1588-
pub const M_CHECK_ACTION: ::c_int = -5;
1589-
pub const M_PERTURB: ::c_int = -6;
1590-
pub const M_ARENA_TEST: ::c_int = -7;
1591-
pub const M_ARENA_MAX: ::c_int = -8;
1592-
15931579
f! {
15941580
pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () {
15951581
for slot in cpuset.bits.iter_mut() {
@@ -2143,7 +2129,6 @@ extern {
21432129
nobj: ::size_t,
21442130
stream: *mut ::FILE
21452131
) -> ::size_t;
2146-
pub fn mallopt(param: ::c_int, value: ::c_int) -> ::c_int;
21472132
}
21482133

21492134
cfg_if! {

src/unix/notbsd/linux/other/mod.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -824,6 +824,19 @@ pub const NFT_TRACETYPE_RULE: ::c_int = 3;
824824
pub const NFT_NG_INCREMENTAL: ::c_int = 0;
825825
pub const NFT_NG_RANDOM: ::c_int = 1;
826826

827+
pub const M_MXFAST: ::c_int = 1;
828+
pub const M_NLBLKS: ::c_int = 2;
829+
pub const M_GRAIN: ::c_int = 3;
830+
pub const M_KEEP: ::c_int = 4;
831+
pub const M_TRIM_THRESHOLD: ::c_int = -1;
832+
pub const M_TOP_PAD: ::c_int = -2;
833+
pub const M_MMAP_THRESHOLD: ::c_int = -3;
834+
pub const M_MMAP_MAX: ::c_int = -4;
835+
pub const M_CHECK_ACTION: ::c_int = -5;
836+
pub const M_PERTURB: ::c_int = -6;
837+
pub const M_ARENA_TEST: ::c_int = -7;
838+
pub const M_ARENA_MAX: ::c_int = -8;
839+
827840
#[doc(hidden)]
828841
pub const AF_MAX: ::c_int = 42;
829842
#[doc(hidden)]
@@ -856,6 +869,7 @@ extern {
856869
pub fn setutxent();
857870
pub fn endutxent();
858871
pub fn getpt() -> ::c_int;
872+
pub fn mallopt(param: ::c_int, value: ::c_int) -> ::c_int;
859873
}
860874

861875
#[link(name = "util")]

0 commit comments

Comments
 (0)