Skip to content

Commit 48a97b2

Browse files
Merge branch 'main' into zhiwei/relibc-constants-update-2
2 parents f44073f + 34527ca commit 48a97b2

File tree

6 files changed

+10
-0
lines changed

6 files changed

+10
-0
lines changed

libc-test/semver/dragonfly.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ IPV6_RECVPKTINFO
500500
IPV6_RECVTCLASS
501501
IPV6_TCLASS
502502
IP_HDRINCL
503+
IP_MINTTL
503504
IP_RECVDSTADDR
504505
IP_RECVIF
505506
IP_RECVTTL

libc-test/semver/freebsd.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,7 @@ IP_BINDANY
663663
IP_BINDMULTI
664664
IP_DONTFRAG
665665
IP_HDRINCL
666+
IP_MINTTL
666667
IP_ORIGDSTADDR
667668
IP_RECVDSTADDR
668669
IP_RECVIF

libc-test/semver/linux-riscv64gc.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,4 @@ TIOCSRS485
8080
flock64
8181
fsblkcnt64_t
8282
fsfilcnt64_t
83+
max_align_t

src/unix/bsd/freebsdlike/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -935,6 +935,7 @@ pub const IP_ADD_MEMBERSHIP: c_int = 12;
935935
pub const IP_DROP_MEMBERSHIP: c_int = 13;
936936
pub const IP_RECVIF: c_int = 20;
937937
pub const IP_RECVTTL: c_int = 65;
938+
pub const IP_MINTTL: c_int = 66;
938939
pub const IPV6_RECVHOPLIMIT: c_int = 37;
939940
pub const IPV6_JOIN_GROUP: c_int = 12;
940941
pub const IPV6_LEAVE_GROUP: c_int = 13;

src/unix/cygwin/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,6 +1038,7 @@ pub const TIOCM_RTS: c_int = 0x004;
10381038
pub const TIOCM_CTS: c_int = 0x020;
10391039
pub const TIOCM_CAR: c_int = 0x040;
10401040
pub const TIOCM_RNG: c_int = 0x080;
1041+
pub const TIOCM_DSR: c_int = 0x100;
10411042
pub const TIOCM_CD: c_int = TIOCM_CAR;
10421043
pub const TIOCM_RI: c_int = TIOCM_RNG;
10431044
pub const TCOOFF: c_int = 0;

src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,11 @@ s_no_extra_traits! {
286286
pub __fcsr: c_uint,
287287
pub __glibc_reserved: [c_uint; 3],
288288
}
289+
290+
#[repr(align(16))]
291+
pub struct max_align_t {
292+
priv_: [f32; 8],
293+
}
289294
}
290295

291296
pub const POSIX_FADV_DONTNEED: c_int = 4;

0 commit comments

Comments
 (0)