Skip to content

Commit 47a94d8

Browse files
committed
Reorder items to be more similar to main
1 parent 53c3473 commit 47a94d8

File tree

1 file changed

+86
-86
lines changed
  • src/unix/linux_like/linux

1 file changed

+86
-86
lines changed

src/unix/linux_like/linux/mod.rs

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -922,92 +922,6 @@ s! {
922922
pub rec_seq: [::c_uchar; TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE],
923923
}
924924

925-
// #include <linux/eventpoll.h>
926-
927-
pub struct epoll_params {
928-
pub busy_poll_usecs: u32,
929-
pub busy_poll_budget: u16,
930-
pub prefer_busy_poll: u8,
931-
pub __pad: u8, // Must be zero
932-
}
933-
934-
#[cfg_attr(
935-
any(
936-
target_pointer_width = "32",
937-
target_arch = "x86_64",
938-
target_arch = "powerpc64",
939-
target_arch = "mips64",
940-
target_arch = "mips64r6",
941-
target_arch = "s390x",
942-
target_arch = "sparc64",
943-
target_arch = "aarch64",
944-
target_arch = "riscv64",
945-
target_arch = "riscv32",
946-
target_arch = "loongarch64"
947-
),
948-
repr(align(4))
949-
)]
950-
#[cfg_attr(
951-
not(any(
952-
target_pointer_width = "32",
953-
target_arch = "x86_64",
954-
target_arch = "powerpc64",
955-
target_arch = "mips64",
956-
target_arch = "mips64r6",
957-
target_arch = "s390x",
958-
target_arch = "sparc64",
959-
target_arch = "aarch64",
960-
target_arch = "riscv64",
961-
target_arch = "riscv32",
962-
target_arch = "loongarch64"
963-
)),
964-
repr(align(8))
965-
)]
966-
pub struct pthread_mutexattr_t {
967-
#[doc(hidden)]
968-
size: [u8; ::__SIZEOF_PTHREAD_MUTEXATTR_T],
969-
}
970-
971-
#[cfg_attr(
972-
any(target_env = "musl", target_env = "ohos", target_pointer_width = "32"),
973-
repr(align(4))
974-
)]
975-
#[cfg_attr(
976-
all(
977-
not(target_env = "musl"),
978-
not(target_env = "ohos"),
979-
target_pointer_width = "64"
980-
),
981-
repr(align(8))
982-
)]
983-
pub struct pthread_rwlockattr_t {
984-
#[doc(hidden)]
985-
size: [u8; ::__SIZEOF_PTHREAD_RWLOCKATTR_T],
986-
}
987-
988-
#[repr(align(4))]
989-
pub struct pthread_condattr_t {
990-
#[doc(hidden)]
991-
size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
992-
}
993-
994-
#[repr(align(4))]
995-
pub struct pthread_barrierattr_t {
996-
#[doc(hidden)]
997-
size: [u8; ::__SIZEOF_PTHREAD_BARRIERATTR_T],
998-
}
999-
1000-
#[repr(align(8))]
1001-
pub struct fanotify_event_metadata {
1002-
pub event_len: __u32,
1003-
pub vers: __u8,
1004-
pub reserved: __u8,
1005-
pub metadata_len: __u16,
1006-
pub mask: __u64,
1007-
pub fd: ::c_int,
1008-
pub pid: ::c_int,
1009-
}
1010-
1011925
// linux/wireless.h
1012926

1013927
pub struct iw_param {
@@ -1142,6 +1056,92 @@ s! {
11421056
pub get_args: __u16,
11431057
pub name: [c_char; ::IFNAMSIZ],
11441058
}
1059+
1060+
// #include <linux/eventpoll.h>
1061+
1062+
pub struct epoll_params {
1063+
pub busy_poll_usecs: u32,
1064+
pub busy_poll_budget: u16,
1065+
pub prefer_busy_poll: u8,
1066+
pub __pad: u8, // Must be zero
1067+
}
1068+
1069+
#[cfg_attr(
1070+
any(
1071+
target_pointer_width = "32",
1072+
target_arch = "x86_64",
1073+
target_arch = "powerpc64",
1074+
target_arch = "mips64",
1075+
target_arch = "mips64r6",
1076+
target_arch = "s390x",
1077+
target_arch = "sparc64",
1078+
target_arch = "aarch64",
1079+
target_arch = "riscv64",
1080+
target_arch = "riscv32",
1081+
target_arch = "loongarch64"
1082+
),
1083+
repr(align(4))
1084+
)]
1085+
#[cfg_attr(
1086+
not(any(
1087+
target_pointer_width = "32",
1088+
target_arch = "x86_64",
1089+
target_arch = "powerpc64",
1090+
target_arch = "mips64",
1091+
target_arch = "mips64r6",
1092+
target_arch = "s390x",
1093+
target_arch = "sparc64",
1094+
target_arch = "aarch64",
1095+
target_arch = "riscv64",
1096+
target_arch = "riscv32",
1097+
target_arch = "loongarch64"
1098+
)),
1099+
repr(align(8))
1100+
)]
1101+
pub struct pthread_mutexattr_t {
1102+
#[doc(hidden)]
1103+
size: [u8; ::__SIZEOF_PTHREAD_MUTEXATTR_T],
1104+
}
1105+
1106+
#[cfg_attr(
1107+
any(target_env = "musl", target_env = "ohos", target_pointer_width = "32"),
1108+
repr(align(4))
1109+
)]
1110+
#[cfg_attr(
1111+
all(
1112+
not(target_env = "musl"),
1113+
not(target_env = "ohos"),
1114+
target_pointer_width = "64"
1115+
),
1116+
repr(align(8))
1117+
)]
1118+
pub struct pthread_rwlockattr_t {
1119+
#[doc(hidden)]
1120+
size: [u8; ::__SIZEOF_PTHREAD_RWLOCKATTR_T],
1121+
}
1122+
1123+
#[repr(align(4))]
1124+
pub struct pthread_condattr_t {
1125+
#[doc(hidden)]
1126+
size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
1127+
}
1128+
1129+
#[repr(align(4))]
1130+
pub struct pthread_barrierattr_t {
1131+
#[doc(hidden)]
1132+
size: [u8; ::__SIZEOF_PTHREAD_BARRIERATTR_T],
1133+
}
1134+
1135+
#[repr(align(8))]
1136+
pub struct fanotify_event_metadata {
1137+
pub event_len: __u32,
1138+
pub vers: __u8,
1139+
pub reserved: __u8,
1140+
pub metadata_len: __u16,
1141+
pub mask: __u64,
1142+
pub fd: ::c_int,
1143+
pub pid: ::c_int,
1144+
}
11451145
}
11461146

11471147
cfg_if! {

0 commit comments

Comments
 (0)