Skip to content

Commit 3c6a2d8

Browse files
committed
Auto merge of #2122 - JohnTitor:at-consts-musl, r=Amanieu
Move `AT_*` consts from `linux_like/linux/gnu` to `linux_like/linux` They are available on musl and uclibc as well. Fixes #2121
2 parents bd7e052 + f560924 commit 3c6a2d8

File tree

2 files changed

+26
-27
lines changed

2 files changed

+26
-27
lines changed

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

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,33 +1223,6 @@ pub const STATX_ATTR_NODUMP: ::c_int = 0x0040;
12231223
pub const STATX_ATTR_ENCRYPTED: ::c_int = 0x0800;
12241224
pub const STATX_ATTR_AUTOMOUNT: ::c_int = 0x1000;
12251225

1226-
// sys/auxv.h
1227-
pub const AT_NULL: ::c_ulong = 0;
1228-
pub const AT_IGNORE: ::c_ulong = 1;
1229-
pub const AT_EXECFD: ::c_ulong = 2;
1230-
pub const AT_PHDR: ::c_ulong = 3;
1231-
pub const AT_PHENT: ::c_ulong = 4;
1232-
pub const AT_PHNUM: ::c_ulong = 5;
1233-
pub const AT_PAGESZ: ::c_ulong = 6;
1234-
pub const AT_BASE: ::c_ulong = 7;
1235-
pub const AT_FLAGS: ::c_ulong = 8;
1236-
pub const AT_ENTRY: ::c_ulong = 9;
1237-
pub const AT_NOTELF: ::c_ulong = 10;
1238-
pub const AT_UID: ::c_ulong = 11;
1239-
pub const AT_EUID: ::c_ulong = 12;
1240-
pub const AT_GID: ::c_ulong = 13;
1241-
pub const AT_EGID: ::c_ulong = 14;
1242-
pub const AT_PLATFORM: ::c_ulong = 15;
1243-
pub const AT_HWCAP: ::c_ulong = 16;
1244-
pub const AT_CLKTCK: ::c_ulong = 17;
1245-
// AT_* values 18 through 22 are reserved
1246-
pub const AT_SECURE: ::c_ulong = 23;
1247-
pub const AT_BASE_PLATFORM: ::c_ulong = 24;
1248-
pub const AT_RANDOM: ::c_ulong = 25;
1249-
pub const AT_HWCAP2: ::c_ulong = 26;
1250-
1251-
pub const AT_EXECFN: ::c_ulong = 31;
1252-
12531226
//sys/timex.h
12541227
pub const ADJ_OFFSET: ::c_uint = 0x0001;
12551228
pub const ADJ_FREQUENCY: ::c_uint = 0x0002;

src/unix/linux_like/linux/mod.rs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,6 +1235,32 @@ pub const _SC_THREAD_ROBUST_PRIO_PROTECT: ::c_int = 248;
12351235
pub const RLIM_SAVED_MAX: ::rlim_t = RLIM_INFINITY;
12361236
pub const RLIM_SAVED_CUR: ::rlim_t = RLIM_INFINITY;
12371237

1238+
pub const AT_NULL: ::c_ulong = 0;
1239+
pub const AT_IGNORE: ::c_ulong = 1;
1240+
pub const AT_EXECFD: ::c_ulong = 2;
1241+
pub const AT_PHDR: ::c_ulong = 3;
1242+
pub const AT_PHENT: ::c_ulong = 4;
1243+
pub const AT_PHNUM: ::c_ulong = 5;
1244+
pub const AT_PAGESZ: ::c_ulong = 6;
1245+
pub const AT_BASE: ::c_ulong = 7;
1246+
pub const AT_FLAGS: ::c_ulong = 8;
1247+
pub const AT_ENTRY: ::c_ulong = 9;
1248+
pub const AT_NOTELF: ::c_ulong = 10;
1249+
pub const AT_UID: ::c_ulong = 11;
1250+
pub const AT_EUID: ::c_ulong = 12;
1251+
pub const AT_GID: ::c_ulong = 13;
1252+
pub const AT_EGID: ::c_ulong = 14;
1253+
pub const AT_PLATFORM: ::c_ulong = 15;
1254+
pub const AT_HWCAP: ::c_ulong = 16;
1255+
pub const AT_CLKTCK: ::c_ulong = 17;
1256+
1257+
pub const AT_SECURE: ::c_ulong = 23;
1258+
pub const AT_BASE_PLATFORM: ::c_ulong = 24;
1259+
pub const AT_RANDOM: ::c_ulong = 25;
1260+
pub const AT_HWCAP2: ::c_ulong = 26;
1261+
1262+
pub const AT_EXECFN: ::c_ulong = 31;
1263+
12381264
pub const GLOB_ERR: ::c_int = 1 << 0;
12391265
pub const GLOB_MARK: ::c_int = 1 << 1;
12401266
pub const GLOB_NOSORT: ::c_int = 1 << 2;

0 commit comments

Comments
 (0)