Skip to content

Commit efaabd8

Browse files
committed
WIP: use freebsd11 linknames for freebsd10
1 parent 411f04d commit efaabd8

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/unix/bsd/freebsdlike/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,7 @@ extern {
11621162
pub fn getutxline(ut: *const utmpx) -> *mut utmpx;
11631163
pub fn initgroups(name: *const ::c_char, basegid: ::gid_t) -> ::c_int;
11641164
#[cfg_attr(
1165-
all(target_os = "freebsd", freebsd11),
1165+
all(target_os = "freebsd", any(freebsd11, freebsd10)),
11661166
link_name = "kevent@FBSD_1.0"
11671167
)]
11681168
pub fn kevent(kq: ::c_int,
@@ -1181,7 +1181,7 @@ extern {
11811181
pub fn mkfifoat(dirfd: ::c_int, pathname: *const ::c_char,
11821182
mode: ::mode_t) -> ::c_int;
11831183
#[cfg_attr(
1184-
all(target_os = "freebsd", freebsd11),
1184+
all(target_os = "freebsd", any(freebsd11, freebsd10)),
11851185
link_name = "mknodat@FBSD_1.1"
11861186
)]
11871187
pub fn mknodat(dirfd: ::c_int, pathname: *const ::c_char,

src/unix/bsd/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ extern {
550550
#[cfg_attr(target_os = "macos", link_name = "glob$INODE64")]
551551
#[cfg_attr(target_os = "netbsd", link_name = "__glob30")]
552552
#[cfg_attr(
553-
all(target_os = "freebsd", freebsd11),
553+
all(target_os = "freebsd", any(freebsd11, freebsd10)),
554554
link_name = "glob@FBSD_1.0"
555555
)]
556556
pub fn glob(pattern: *const ::c_char,
@@ -560,7 +560,7 @@ extern {
560560
pglob: *mut ::glob_t) -> ::c_int;
561561
#[cfg_attr(target_os = "netbsd", link_name = "__globfree30")]
562562
#[cfg_attr(
563-
all(target_os = "freebsd", freebsd11),
563+
all(target_os = "freebsd", any(freebsd11, freebsd10)),
564564
link_name = "globfree@FBSD_1.0"
565565
)]
566566
pub fn globfree(pglob: *mut ::glob_t);

src/unix/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ extern {
567567
#[cfg_attr(target_os = "macos", link_name = "fstat$INODE64")]
568568
#[cfg_attr(target_os = "netbsd", link_name = "__fstat50")]
569569
#[cfg_attr(
570-
all(target_os = "freebsd", freebsd11),
570+
all(target_os = "freebsd", any(freebsd11, freebsd10)),
571571
link_name = "fstat@FBSD_1.0"
572572
)]
573573
pub fn fstat(fildes: ::c_int, buf: *mut stat) -> ::c_int;
@@ -577,7 +577,7 @@ extern {
577577
#[cfg_attr(target_os = "macos", link_name = "stat$INODE64")]
578578
#[cfg_attr(target_os = "netbsd", link_name = "__stat50")]
579579
#[cfg_attr(
580-
all(target_os = "freebsd", freebsd11),
580+
all(target_os = "freebsd", any(freebsd11, freebsd10)),
581581
link_name = "stat@FBSD_1.0"
582582
)]
583583
pub fn stat(path: *const c_char, buf: *mut stat) -> ::c_int;
@@ -608,7 +608,7 @@ extern {
608608
#[cfg_attr(target_os = "macos", link_name = "readdir$INODE64")]
609609
#[cfg_attr(target_os = "netbsd", link_name = "__readdir30")]
610610
#[cfg_attr(
611-
all(target_os = "freebsd", freebsd11),
611+
all(target_os = "freebsd", any(freebsd11, freebsd10)),
612612
link_name = "readdir@FBSD_1.0"
613613
)]
614614
pub fn readdir(dirp: *mut ::DIR) -> *mut ::dirent;
@@ -631,7 +631,7 @@ extern {
631631
flags: ::c_int) -> ::c_int;
632632
#[cfg_attr(target_os = "macos", link_name = "fstatat$INODE64")]
633633
#[cfg_attr(
634-
all(target_os = "freebsd", freebsd11),
634+
all(target_os = "freebsd", any(freebsd11, freebsd10)),
635635
link_name = "fstatat@FBSD_1.1"
636636
)]
637637
pub fn fstatat(dirfd: ::c_int, pathname: *const ::c_char,
@@ -786,7 +786,7 @@ extern {
786786
#[cfg_attr(target_os = "macos", link_name = "lstat$INODE64")]
787787
#[cfg_attr(target_os = "netbsd", link_name = "__lstat50")]
788788
#[cfg_attr(
789-
all(target_os = "freebsd", freebsd11),
789+
all(target_os = "freebsd", any(freebsd11, freebsd10)),
790790
link_name = "lstat@FBSD_1.0"
791791
)]
792792
pub fn lstat(path: *const c_char, buf: *mut stat) -> ::c_int;
@@ -962,7 +962,7 @@ extern {
962962

963963
#[cfg_attr(target_os = "netbsd", link_name = "__mknod50")]
964964
#[cfg_attr(
965-
all(target_os = "freebsd", freebsd11),
965+
all(target_os = "freebsd", any(freebsd11, freebsd10)),
966966
link_name = "mknod@FBSD_1.0"
967967
)]
968968
pub fn mknod(pathname: *const ::c_char, mode: ::mode_t,
@@ -1126,7 +1126,7 @@ cfg_if! {
11261126
#[cfg_attr(target_os = "macos", link_name = "readdir_r$INODE64")]
11271127
#[cfg_attr(target_os = "netbsd", link_name = "__readdir_r30")]
11281128
#[cfg_attr(
1129-
all(target_os = "freebsd", freebsd11),
1129+
all(target_os = "freebsd", any(freebsd11, freebsd10)),
11301130
link_name = "readdir_r@FBSD_1.0"
11311131
)]
11321132
/// The 64-bit libc on Solaris and illumos only has readdir_r. If a

0 commit comments

Comments
 (0)