Skip to content

Commit aeadbde

Browse files
committed
Use appropriate functions in FreeBSD 12
1 parent bd5f5d9 commit aeadbde

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/unix/bsd/freebsdlike/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1135,7 +1135,7 @@ extern {
11351135
pub fn getutxid(ut: *const utmpx) -> *mut utmpx;
11361136
pub fn getutxline(ut: *const utmpx) -> *mut utmpx;
11371137
pub fn initgroups(name: *const ::c_char, basegid: ::gid_t) -> ::c_int;
1138-
#[cfg_attr(target_os = "freebsd", link_name = "kevent@FBSD_1.0")]
1138+
#[cfg_attr(all(target_os = "freebsd", not(freebsd12)), link_name = "kevent@FBSD_1.0")]
11391139
pub fn kevent(kq: ::c_int,
11401140
changelist: *const ::kevent,
11411141
nchanges: ::c_int,
@@ -1151,7 +1151,7 @@ extern {
11511151
n: ::size_t) -> *mut ::c_void;
11521152
pub fn mkfifoat(dirfd: ::c_int, pathname: *const ::c_char,
11531153
mode: ::mode_t) -> ::c_int;
1154-
#[cfg_attr(target_os = "freebsd", link_name = "mknodat@FBSD_1.1")]
1154+
#[cfg_attr(all(target_os = "freebsd", not(freebsd12)), link_name = "mknodat@FBSD_1.1")]
11551155
pub fn mknodat(dirfd: ::c_int, pathname: *const ::c_char,
11561156
mode: ::mode_t, dev: dev_t) -> ::c_int;
11571157
pub fn mq_close(mqd: ::mqd_t) -> ::c_int;

src/unix/bsd/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -523,14 +523,14 @@ extern {
523523

524524
#[cfg_attr(target_os = "macos", link_name = "glob$INODE64")]
525525
#[cfg_attr(target_os = "netbsd", link_name = "__glob30")]
526-
#[cfg_attr(target_os = "freebsd", link_name = "glob@FBSD_1.0")]
526+
#[cfg_attr(all(target_os = "freebsd", not(freebsd12)), link_name = "glob@FBSD_1.0")]
527527
pub fn glob(pattern: *const ::c_char,
528528
flags: ::c_int,
529529
errfunc: ::Option<extern fn(epath: *const ::c_char,
530530
errno: ::c_int) -> ::c_int>,
531531
pglob: *mut ::glob_t) -> ::c_int;
532532
#[cfg_attr(target_os = "netbsd", link_name = "__globfree30")]
533-
#[cfg_attr(target_os = "freebsd", link_name = "globfree@FBSD_1.0")]
533+
#[cfg_attr(all(target_os = "freebsd", not(freebsd12)), link_name = "globfree@FBSD_1.0")]
534534
pub fn globfree(pglob: *mut ::glob_t);
535535

536536
pub fn posix_madvise(addr: *mut ::c_void, len: ::size_t, advice: ::c_int)

src/unix/mod.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -580,14 +580,14 @@ extern {
580580

581581
#[cfg_attr(target_os = "macos", link_name = "fstat$INODE64")]
582582
#[cfg_attr(target_os = "netbsd", link_name = "__fstat50")]
583-
#[cfg_attr(target_os = "freebsd", link_name = "fstat@FBSD_1.0")]
583+
#[cfg_attr(all(target_os = "freebsd", not(freebsd12)), link_name = "fstat@FBSD_1.0")]
584584
pub fn fstat(fildes: ::c_int, buf: *mut stat) -> ::c_int;
585585

586586
pub fn mkdir(path: *const c_char, mode: mode_t) -> ::c_int;
587587

588588
#[cfg_attr(target_os = "macos", link_name = "stat$INODE64")]
589589
#[cfg_attr(target_os = "netbsd", link_name = "__stat50")]
590-
#[cfg_attr(target_os = "freebsd", link_name = "stat@FBSD_1.0")]
590+
#[cfg_attr(all(target_os = "freebsd", not(freebsd12)), link_name = "stat@FBSD_1.0")]
591591
pub fn stat(path: *const c_char, buf: *mut stat) -> ::c_int;
592592

593593
pub fn pclose(stream: *mut ::FILE) -> ::c_int;
@@ -621,11 +621,11 @@ extern {
621621

622622
#[cfg_attr(target_os = "macos", link_name = "readdir$INODE64")]
623623
#[cfg_attr(target_os = "netbsd", link_name = "__readdir30")]
624-
#[cfg_attr(target_os = "freebsd", link_name = "readdir@FBSD_1.0")]
624+
#[cfg_attr(all(target_os = "freebsd", not(freebsd12)), link_name = "readdir@FBSD_1.0")]
625625
pub fn readdir(dirp: *mut ::DIR) -> *mut ::dirent;
626626
#[cfg_attr(target_os = "macos", link_name = "readdir_r$INODE64")]
627627
#[cfg_attr(target_os = "netbsd", link_name = "__readdir_r30")]
628-
#[cfg_attr(target_os = "freebsd", link_name = "readdir_r@FBSD_1.0")]
628+
#[cfg_attr(all(target_os = "freebsd", not(freebsd12)), link_name = "readdir_r@FBSD_1.0")]
629629
/// The 64-bit libc on Solaris and illumos only has readdir_r. If a
630630
/// 32-bit Solaris or illumos target is ever created, it should use
631631
/// __posix_readdir_r. See libc(3LIB) on Solaris or illumos:
@@ -654,7 +654,7 @@ extern {
654654
owner: ::uid_t, group: ::gid_t,
655655
flags: ::c_int) -> ::c_int;
656656
#[cfg_attr(target_os = "macos", link_name = "fstatat$INODE64")]
657-
#[cfg_attr(target_os = "freebsd", link_name = "fstatat@FBSD_1.1")]
657+
#[cfg_attr(all(target_os = "freebsd", not(freebsd12)), link_name = "fstatat@FBSD_1.1")]
658658
pub fn fstatat(dirfd: ::c_int, pathname: *const ::c_char,
659659
buf: *mut stat, flags: ::c_int) -> ::c_int;
660660
pub fn linkat(olddirfd: ::c_int, oldpath: *const ::c_char,
@@ -809,7 +809,7 @@ extern {
809809

810810
#[cfg_attr(target_os = "macos", link_name = "lstat$INODE64")]
811811
#[cfg_attr(target_os = "netbsd", link_name = "__lstat50")]
812-
#[cfg_attr(target_os = "freebsd", link_name = "lstat@FBSD_1.0")]
812+
#[cfg_attr(all(target_os = "freebsd", not(freebsd12)), link_name = "lstat@FBSD_1.0")]
813813
pub fn lstat(path: *const c_char, buf: *mut stat) -> ::c_int;
814814

815815
#[cfg_attr(all(target_os = "macos", target_arch = "x86"),
@@ -989,7 +989,7 @@ extern {
989989
pub fn difftime(time1: time_t, time0: time_t) -> ::c_double;
990990

991991
#[cfg_attr(target_os = "netbsd", link_name = "__mknod50")]
992-
#[cfg_attr(target_os = "freebsd", link_name = "mknod@FBSD_1.0")]
992+
#[cfg_attr(all(target_os = "freebsd", not(freebsd12)), link_name = "mknod@FBSD_1.0")]
993993
pub fn mknod(pathname: *const ::c_char, mode: ::mode_t,
994994
dev: ::dev_t) -> ::c_int;
995995
pub fn gethostname(name: *mut ::c_char, len: ::size_t) -> ::c_int;

0 commit comments

Comments
 (0)