Fix definition of TIOCTIMESTAMP on FreeBSD x86

https://github.com/freebsd/freebsd-src/blob/main/sys/sys/ttycom.h (backport <rust-lang#3948>) (cherry picked from commit 60cf16d)
tgross35 · Nov 6, 2024 · e054b7f · e054b7f
1 parent a93d23d
commit e054b7f
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 1 deletion.
diff --git a/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/src/unix/bsd/freebsdlike/dragonfly/mod.rs
@@ -1462,6 +1462,7 @@ pub const TIOCISPTMASTER: ::c_ulong = 0x20007455;
 pub const TIOCMODG: ::c_ulong = 0x40047403;
 pub const TIOCMODS: ::c_ulong = 0x80047404;
 pub const TIOCREMOTE: ::c_ulong = 0x80047469;
+pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
 
 // Constants used by "at" family of system calls.
 pub const AT_FDCWD: ::c_int = 0xFFFAFDCD; // invalid file descriptor

diff --git a/src/unix/bsd/freebsdlike/freebsd/aarch64.rs b/src/unix/bsd/freebsdlike/freebsd/aarch64.rs
@@ -144,3 +144,4 @@ cfg_if! {
 
 pub const MAP_32BIT: ::c_int = 0x00080000;
 pub const MINSIGSTKSZ: ::size_t = 4096; // 1024 * 4
+pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
diff --git a/src/unix/bsd/freebsdlike/freebsd/arm.rs b/src/unix/bsd/freebsdlike/freebsd/arm.rs
@@ -62,3 +62,4 @@ cfg_if! {
 
 pub const MAP_32BIT: ::c_int = 0x00080000;
 pub const MINSIGSTKSZ: ::size_t = 4096; // 1024 * 4
+pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
@@ -81,3 +81,4 @@ cfg_if! {
 
 pub const MAP_32BIT: ::c_int = 0x00080000;
 pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
+pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
@@ -81,3 +81,4 @@ cfg_if! {
 
 pub const MAP_32BIT: ::c_int = 0x00080000;
 pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
+pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
diff --git a/src/unix/bsd/freebsdlike/freebsd/riscv64.rs b/src/unix/bsd/freebsdlike/freebsd/riscv64.rs
@@ -152,3 +152,4 @@ cfg_if! {
 
 pub const MAP_32BIT: ::c_int = 0x00080000;
 pub const MINSIGSTKSZ: ::size_t = 4096; // 1024 * 4
+pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
diff --git a/src/unix/bsd/freebsdlike/freebsd/x86.rs b/src/unix/bsd/freebsdlike/freebsd/x86.rs
@@ -166,3 +166,4 @@ cfg_if! {
 pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
 
 pub const KINFO_FILE_SIZE: ::c_int = 1392;
+pub const TIOCTIMESTAMP: ::c_ulong = 0x40087459;
diff --git a/src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs b/src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs
@@ -265,6 +265,8 @@ pub const _MC_FPOWNED_PCB: c_long = 0x20002;
 
 pub const KINFO_FILE_SIZE: ::c_int = 1392;
 
+pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
+
 cfg_if! {
     if #[cfg(libc_align)] {
         mod align;

diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs
@@ -1251,7 +1251,6 @@ pub const TIOCGETD: ::c_ulong = 0x4004741a;
 pub const TIOCSETD: ::c_ulong = 0x8004741b;
 pub const TIOCGDRAINWAIT: ::c_ulong = 0x40047456;
 pub const TIOCSDRAINWAIT: ::c_ulong = 0x80047457;
-pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
 pub const TIOCMGDTRWAIT: ::c_ulong = 0x4004745a;
 pub const TIOCMSDTRWAIT: ::c_ulong = 0x8004745b;
 pub const TIOCDRAIN: ::c_ulong = 0x2000745e;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -144,3 +144,4 @@ cfg_if! {

		pub const MAP_32BIT: ::c_int = 0x00080000;
		pub const MINSIGSTKSZ: ::size_t = 4096; // 1024 * 4
		pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,3 +62,4 @@ cfg_if! {

		pub const MAP_32BIT: ::c_int = 0x00080000;
		pub const MINSIGSTKSZ: ::size_t = 4096; // 1024 * 4
		pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,3 +81,4 @@ cfg_if! {

		pub const MAP_32BIT: ::c_int = 0x00080000;
		pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
		pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -152,3 +152,4 @@ cfg_if! {

		pub const MAP_32BIT: ::c_int = 0x00080000;
		pub const MINSIGSTKSZ: ::size_t = 4096; // 1024 * 4
		pub const TIOCTIMESTAMP: ::c_ulong = 0x40107459;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -166,3 +166,4 @@ cfg_if! {
		pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4

		pub const KINFO_FILE_SIZE: ::c_int = 1392;
		pub const TIOCTIMESTAMP: ::c_ulong = 0x40087459;