Skip to content

Commit ce7e3a7

Browse files
committed
Auto merge of #1389 - gnzlbg:ref_linux2, r=gnzlbg
Rename the notbsd module to linux_like
2 parents 0e25493 + 8f098a3 commit ce7e3a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+13
-14
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/unix/notbsd/emscripten/mod.rs src/unix/linux_like/emscripten/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,7 @@ pub const RTLD_GLOBAL: ::c_int = 0x100;
12951295
pub const RTLD_NOLOAD: ::c_int = 0x4;
12961296

12971297
// TODO(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
1298-
// kernel 3.10). See also notbsd/mod.rs
1298+
// kernel 3.10). See also linux_like/mod.rs
12991299
pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
13001300
pub const CLOCK_TAI: ::clockid_t = 11;
13011301

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/unix/notbsd/linux/musl/mod.rs src/unix/linux_like/linux/musl/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ pub const RTLD_GLOBAL: ::c_int = 0x100;
301301
pub const RTLD_NOLOAD: ::c_int = 0x4;
302302

303303
// TODO(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
304-
// kernel 3.10). See also notbsd/mod.rs
304+
// kernel 3.10). See also linux_like/mod.rs
305305
pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
306306
pub const CLOCK_TAI: ::clockid_t = 11;
307307

File renamed without changes.
File renamed without changes.

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1101,11 +1101,10 @@ extern {
11011101
pub fn getauxval(type_: ::c_ulong) -> ::c_ulong;
11021102
#[cfg_attr(target_os = "netbsd", link_name = "__getpwent_r50")]
11031103
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwent_r")]
1104-
pub fn getpwent_r(pwd: *mut ::unix::notbsd::linux::passwd,
1104+
pub fn getpwent_r(pwd: *mut ::passwd,
11051105
buf: *mut ::c_char,
11061106
buflen: ::size_t,
1107-
result: *mut *mut ::unix::notbsd
1108-
::linux::passwd) -> ::c_int;
1107+
result: *mut *mut ::passwd) -> ::c_int;
11091108
#[cfg_attr(target_os = "netbsd", link_name = "__getgrent_r50")]
11101109
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrent_r")]
11111110
pub fn getgrent_r(grp: *mut ::group,
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/unix/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1147,8 +1147,8 @@ cfg_if! {
11471147
} else if #[cfg(any(target_os = "linux",
11481148
target_os = "android",
11491149
target_os = "emscripten"))] {
1150-
mod notbsd;
1151-
pub use self::notbsd::*;
1150+
mod linux_like;
1151+
pub use self::linux_like::*;
11521152
} else if #[cfg(any(target_os = "macos",
11531153
target_os = "ios",
11541154
target_os = "freebsd",

src/unix/uclibc/arm/mod.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ pub const CLONE_NEWCGROUP: ::c_int = 0x02000000; // from linux/mod.rs
215215
pub const EPOLLEXCLUSIVE: ::c_int = 0x10000000; // from linux/mod.rs
216216
pub const EPOLLWAKEUP: ::c_int = 0x20000000; // from linux/other/mod.rs
217217
pub const EXTPROC: ::tcflag_t = 0o200000; // from asm-generic/termbits.h
218-
pub const F_GETPIPE_SZ: ::c_int = 1032; // from notbsd/mod.rs
219-
pub const F_SETPIPE_SZ: ::c_int = 1031; // from notbsd/mod.rs
218+
pub const F_GETPIPE_SZ: ::c_int = 1032; // from linux_like/mod.rs
219+
pub const F_SETPIPE_SZ: ::c_int = 1031; // from linux_like/mod.rs
220220
pub const LIO_NOP: ::c_int = 2; // from linux/mod.rs
221221
pub const LIO_NOWAIT: ::c_int = 1; // from linux/mod.rs
222222
pub const LIO_READ: ::c_int = 0; // from linux/mod.rs
@@ -226,12 +226,12 @@ pub const MAP_HUGETLB: ::c_int = 0x040000; // from linux/other/mod.rs
226226
pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;
227227
pub const RB_KEXEC: ::c_int = 0x45584543u32 as i32; // from linux/mod.rs
228228
pub const RB_SW_SUSPEND: ::c_int = 0xd000fce2u32 as i32; // from linux/mod.rs
229-
pub const SO_BUSY_POLL: ::c_int = 46; // from src/unix/notbsd/mod.rs
230-
pub const SO_PEEK_OFF: ::c_int = 42; // from src/unix/notbsd/mod.rs
231-
pub const SO_REUSEPORT: ::c_int = 15; // from src/unix/notbsd/mod.rs
232-
pub const SOL_NETLINK: ::c_int = 270; // from src/unix/notbsd/mod.rs
229+
pub const SO_BUSY_POLL: ::c_int = 46; // from src/unix/linux_like/mod.rs
230+
pub const SO_PEEK_OFF: ::c_int = 42; // from src/unix/linux_like/mod.rs
231+
pub const SO_REUSEPORT: ::c_int = 15; // from src/unix/linux_like/mod.rs
232+
pub const SOL_NETLINK: ::c_int = 270; // from src/unix/linux_like/mod.rs
233233
pub const _POSIX_VDISABLE: ::cc_t = 0; // from linux/mod.rs
234-
pub const AT_EMPTY_PATH: ::c_int = 0x1000; // from notbsd/mod.rs
234+
pub const AT_EMPTY_PATH: ::c_int = 0x1000; // from linux_like/mod.rs
235235

236236
// autogenerated constants with hand tuned types
237237
pub const AT_NO_AUTOMOUNT: ::c_int = 0x800;

0 commit comments

Comments
 (0)