Skip to content

Commit 08e8a3a

Browse files
JohnTitorJohnTitor
authored
Merge pull request #1712 from pfmooney/cfg_attr-cleanup
Clean up unnecessary link_name attributes
2 parents 53bdd78 + 1a15af9 commit 08e8a3a

File tree

7 files changed

+0
-106
lines changed

7 files changed

+0
-106
lines changed

‎src/unix/bsd/freebsdlike/mod.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,6 @@ extern "C" {
12451245
buflen: ::size_t,
12461246
result: *mut *mut ::group,
12471247
) -> ::c_int;
1248-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwent_r50")]
12491248
pub fn getpwent_r(
12501249
pwd: *mut ::passwd,
12511250
buf: *mut ::c_char,

‎src/unix/bsd/mod.rs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,6 @@ extern "C" {
686686
) -> ::ssize_t;
687687

688688
pub fn sync();
689-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
690689
pub fn getgrgid_r(
691690
gid: ::gid_t,
692691
grp: *mut ::group,
@@ -702,7 +701,6 @@ extern "C" {
702701
pub fn sigaltstack(ss: *const stack_t, oss: *mut stack_t) -> ::c_int;
703702
pub fn sem_close(sem: *mut sem_t) -> ::c_int;
704703
pub fn getdtablesize() -> ::c_int;
705-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrnam_r")]
706704
pub fn getgrnam_r(
707705
name: *const ::c_char,
708706
grp: *mut ::group,
@@ -729,7 +727,6 @@ extern "C" {
729727
pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
730728
pub fn sem_unlink(name: *const ::c_char) -> ::c_int;
731729
#[cfg_attr(target_os = "netbsd", link_name = "__getpwnam_r50")]
732-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwnam_r")]
733730
pub fn getpwnam_r(
734731
name: *const ::c_char,
735732
pwd: *mut passwd,
@@ -738,7 +735,6 @@ extern "C" {
738735
result: *mut *mut passwd,
739736
) -> ::c_int;
740737
#[cfg_attr(target_os = "netbsd", link_name = "__getpwuid_r50")]
741-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwuid_r")]
742738
pub fn getpwuid_r(
743739
uid: ::uid_t,
744740
pwd: *mut passwd,
@@ -750,7 +746,6 @@ extern "C" {
750746
all(target_os = "macos", target_arch = "x86"),
751747
link_name = "sigwait$UNIX2003"
752748
)]
753-
#[cfg_attr(target_os = "solaris", link_name = "__posix_sigwait")]
754749
pub fn sigwait(set: *const sigset_t, sig: *mut ::c_int) -> ::c_int;
755750
pub fn pthread_atfork(
756751
prepare: ::Option<unsafe extern "C" fn()>,

‎src/unix/linux_like/android/mod.rs‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2349,33 +2349,22 @@ extern "C" {
23492349
pub fn setfsgid(gid: ::gid_t) -> ::c_int;
23502350
pub fn setfsuid(uid: ::uid_t) -> ::c_int;
23512351
pub fn sigsuspend(mask: *const ::sigset_t) -> ::c_int;
2352-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
23532352
pub fn getgrgid_r(
23542353
gid: ::gid_t,
23552354
grp: *mut ::group,
23562355
buf: *mut ::c_char,
23572356
buflen: ::size_t,
23582357
result: *mut *mut ::group,
23592358
) -> ::c_int;
2360-
#[cfg_attr(
2361-
all(target_os = "macos", target_arch = "x86"),
2362-
link_name = "sigaltstack$UNIX2003"
2363-
)]
2364-
#[cfg_attr(target_os = "netbsd", link_name = "__sigaltstack14")]
23652359
pub fn sigaltstack(ss: *const stack_t, oss: *mut stack_t) -> ::c_int;
23662360
pub fn sem_close(sem: *mut sem_t) -> ::c_int;
2367-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrnam_r")]
23682361
pub fn getgrnam_r(
23692362
name: *const ::c_char,
23702363
grp: *mut ::group,
23712364
buf: *mut ::c_char,
23722365
buflen: ::size_t,
23732366
result: *mut *mut ::group,
23742367
) -> ::c_int;
2375-
#[cfg_attr(
2376-
all(target_os = "macos", target_arch = "x86"),
2377-
link_name = "pthread_sigmask$UNIX2003"
2378-
)]
23792368
pub fn pthread_sigmask(
23802369
how: ::c_int,
23812370
set: *const sigset_t,
@@ -2386,29 +2375,20 @@ extern "C" {
23862375
pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
23872376
pub fn sem_unlink(name: *const ::c_char) -> ::c_int;
23882377
pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int;
2389-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwnam_r50")]
2390-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwnam_r")]
23912378
pub fn getpwnam_r(
23922379
name: *const ::c_char,
23932380
pwd: *mut passwd,
23942381
buf: *mut ::c_char,
23952382
buflen: ::size_t,
23962383
result: *mut *mut passwd,
23972384
) -> ::c_int;
2398-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwuid_r50")]
2399-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwuid_r")]
24002385
pub fn getpwuid_r(
24012386
uid: ::uid_t,
24022387
pwd: *mut passwd,
24032388
buf: *mut ::c_char,
24042389
buflen: ::size_t,
24052390
result: *mut *mut passwd,
24062391
) -> ::c_int;
2407-
#[cfg_attr(
2408-
all(target_os = "macos", target_arch = "x86"),
2409-
link_name = "sigwait$UNIX2003"
2410-
)]
2411-
#[cfg_attr(target_os = "solaris", link_name = "__posix_sigwait")]
24122392
pub fn sigwait(set: *const sigset_t, sig: *mut ::c_int) -> ::c_int;
24132393
pub fn pthread_atfork(
24142394
prepare: ::Option<unsafe extern "C" fn()>,
@@ -2427,10 +2407,6 @@ extern "C" {
24272407
attr: *const pthread_mutexattr_t,
24282408
pshared: *mut ::c_int,
24292409
) -> ::c_int;
2430-
#[cfg_attr(
2431-
all(target_os = "macos", target_arch = "x86"),
2432-
link_name = "popen$UNIX2003"
2433-
)]
24342410
pub fn popen(command: *const c_char, mode: *const c_char) -> *mut ::FILE;
24352411
pub fn faccessat(
24362412
dirfd: ::c_int,

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,16 +1259,12 @@ extern "C" {
12591259
pub fn sched_getcpu() -> ::c_int;
12601260
pub fn mallinfo() -> ::mallinfo;
12611261
pub fn malloc_usable_size(ptr: *mut ::c_void) -> ::size_t;
1262-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwent_r50")]
1263-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwent_r")]
12641262
pub fn getpwent_r(
12651263
pwd: *mut ::passwd,
12661264
buf: *mut ::c_char,
12671265
buflen: ::size_t,
12681266
result: *mut *mut ::passwd,
12691267
) -> ::c_int;
1270-
#[cfg_attr(target_os = "netbsd", link_name = "__getgrent_r50")]
1271-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrent_r")]
12721268
pub fn getgrent_r(
12731269
grp: *mut ::group,
12741270
buf: *mut ::c_char,

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3105,23 +3105,16 @@ extern "C" {
31053105
count: ::size_t,
31063106
) -> ::ssize_t;
31073107
pub fn sigsuspend(mask: *const ::sigset_t) -> ::c_int;
3108-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
31093108
pub fn getgrgid_r(
31103109
gid: ::gid_t,
31113110
grp: *mut ::group,
31123111
buf: *mut ::c_char,
31133112
buflen: ::size_t,
31143113
result: *mut *mut ::group,
31153114
) -> ::c_int;
3116-
#[cfg_attr(
3117-
all(target_os = "macos", target_arch = "x86"),
3118-
link_name = "sigaltstack$UNIX2003"
3119-
)]
3120-
#[cfg_attr(target_os = "netbsd", link_name = "__sigaltstack14")]
31213115
pub fn sigaltstack(ss: *const stack_t, oss: *mut stack_t) -> ::c_int;
31223116
pub fn sem_close(sem: *mut sem_t) -> ::c_int;
31233117
pub fn getdtablesize() -> ::c_int;
3124-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrnam_r")]
31253118
pub fn getgrnam_r(
31263119
name: *const ::c_char,
31273120
grp: *mut ::group,
@@ -3130,10 +3123,6 @@ extern "C" {
31303123
result: *mut *mut ::group,
31313124
) -> ::c_int;
31323125
pub fn initgroups(user: *const ::c_char, group: ::gid_t) -> ::c_int;
3133-
#[cfg_attr(
3134-
all(target_os = "macos", target_arch = "x86"),
3135-
link_name = "pthread_sigmask$UNIX2003"
3136-
)]
31373126
pub fn pthread_sigmask(
31383127
how: ::c_int,
31393128
set: *const sigset_t,
@@ -3145,29 +3134,20 @@ extern "C" {
31453134
pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
31463135
pub fn sem_unlink(name: *const ::c_char) -> ::c_int;
31473136
pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int;
3148-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwnam_r50")]
3149-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwnam_r")]
31503137
pub fn getpwnam_r(
31513138
name: *const ::c_char,
31523139
pwd: *mut passwd,
31533140
buf: *mut ::c_char,
31543141
buflen: ::size_t,
31553142
result: *mut *mut passwd,
31563143
) -> ::c_int;
3157-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwuid_r50")]
3158-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwuid_r")]
31593144
pub fn getpwuid_r(
31603145
uid: ::uid_t,
31613146
pwd: *mut passwd,
31623147
buf: *mut ::c_char,
31633148
buflen: ::size_t,
31643149
result: *mut *mut passwd,
31653150
) -> ::c_int;
3166-
#[cfg_attr(
3167-
all(target_os = "macos", target_arch = "x86"),
3168-
link_name = "sigwait$UNIX2003"
3169-
)]
3170-
#[cfg_attr(target_os = "solaris", link_name = "__posix_sigwait")]
31713151
pub fn sigwait(set: *const sigset_t, sig: *mut ::c_int) -> ::c_int;
31723152
pub fn pthread_atfork(
31733153
prepare: ::Option<unsafe extern "C" fn()>,
@@ -3185,10 +3165,6 @@ extern "C" {
31853165
attr: *const pthread_mutexattr_t,
31863166
pshared: *mut ::c_int,
31873167
) -> ::c_int;
3188-
#[cfg_attr(
3189-
all(target_os = "macos", target_arch = "x86"),
3190-
link_name = "popen$UNIX2003"
3191-
)]
31923168
pub fn popen(command: *const c_char, mode: *const c_char) -> *mut ::FILE;
31933169
pub fn faccessat(
31943170
dirfd: ::c_int,

‎src/unix/newlib/mod.rs‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -639,34 +639,23 @@ extern "C" {
639639
envp: *const *const ::c_char,
640640
) -> ::c_int;
641641
pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::c_void) -> ::c_int;
642-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
643642
pub fn getgrgid_r(
644643
gid: ::gid_t,
645644
grp: *mut ::group,
646645
buf: *mut ::c_char,
647646
buflen: ::size_t,
648647
result: *mut *mut ::group,
649648
) -> ::c_int;
650-
#[cfg_attr(
651-
all(target_os = "macos", target_arch = "x86"),
652-
link_name = "sigaltstack$UNIX2003"
653-
)]
654-
#[cfg_attr(target_os = "netbsd", link_name = "__sigaltstack14")]
655649
pub fn sigaltstack(ss: *const stack_t, oss: *mut stack_t) -> ::c_int;
656650
pub fn sem_close(sem: *mut sem_t) -> ::c_int;
657651
pub fn getdtablesize() -> ::c_int;
658-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrnam_r")]
659652
pub fn getgrnam_r(
660653
name: *const ::c_char,
661654
grp: *mut ::group,
662655
buf: *mut ::c_char,
663656
buflen: ::size_t,
664657
result: *mut *mut ::group,
665658
) -> ::c_int;
666-
#[cfg_attr(
667-
all(target_os = "macos", target_arch = "x86"),
668-
link_name = "pthread_sigmask$UNIX2003"
669-
)]
670659
pub fn pthread_sigmask(
671660
how: ::c_int,
672661
set: *const sigset_t,
@@ -677,40 +666,27 @@ extern "C" {
677666
pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
678667
pub fn sem_unlink(name: *const ::c_char) -> ::c_int;
679668
pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int;
680-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwnam_r50")]
681-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwnam_r")]
682669
pub fn getpwnam_r(
683670
name: *const ::c_char,
684671
pwd: *mut passwd,
685672
buf: *mut ::c_char,
686673
buflen: ::size_t,
687674
result: *mut *mut passwd,
688675
) -> ::c_int;
689-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwuid_r50")]
690-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwuid_r")]
691676
pub fn getpwuid_r(
692677
uid: ::uid_t,
693678
pwd: *mut passwd,
694679
buf: *mut ::c_char,
695680
buflen: ::size_t,
696681
result: *mut *mut passwd,
697682
) -> ::c_int;
698-
#[cfg_attr(
699-
all(target_os = "macos", target_arch = "x86"),
700-
link_name = "sigwait$UNIX2003"
701-
)]
702-
#[cfg_attr(target_os = "solaris", link_name = "__posix_sigwait")]
703683
pub fn sigwait(set: *const sigset_t, sig: *mut ::c_int) -> ::c_int;
704684
pub fn pthread_atfork(
705685
prepare: ::Option<unsafe extern "C" fn()>,
706686
parent: ::Option<unsafe extern "C" fn()>,
707687
child: ::Option<unsafe extern "C" fn()>,
708688
) -> ::c_int;
709689
pub fn getgrgid(gid: ::gid_t) -> *mut ::group;
710-
#[cfg_attr(
711-
all(target_os = "macos", target_arch = "x86"),
712-
link_name = "popen$UNIX2003"
713-
)]
714690
pub fn popen(command: *const c_char, mode: *const c_char) -> *mut ::FILE;
715691
pub fn uname(buf: *mut ::utsname) -> ::c_int;
716692
}

‎src/unix/uclibc/mod.rs‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2185,34 +2185,23 @@ extern "C" {
21852185
msg: *mut ::msghdr,
21862186
flags: ::c_int,
21872187
) -> ::ssize_t;
2188-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
21892188
pub fn getgrgid_r(
21902189
gid: ::gid_t,
21912190
grp: *mut ::group,
21922191
buf: *mut ::c_char,
21932192
buflen: ::size_t,
21942193
result: *mut *mut ::group,
21952194
) -> ::c_int;
2196-
#[cfg_attr(
2197-
all(target_os = "macos", target_arch = "x86"),
2198-
link_name = "sigaltstack$UNIX2003"
2199-
)]
2200-
#[cfg_attr(target_os = "netbsd", link_name = "__sigaltstack14")]
22012195
pub fn sigaltstack(ss: *const stack_t, oss: *mut stack_t) -> ::c_int;
22022196
pub fn sem_close(sem: *mut sem_t) -> ::c_int;
22032197
pub fn getdtablesize() -> ::c_int;
2204-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrnam_r")]
22052198
pub fn getgrnam_r(
22062199
name: *const ::c_char,
22072200
grp: *mut ::group,
22082201
buf: *mut ::c_char,
22092202
buflen: ::size_t,
22102203
result: *mut *mut ::group,
22112204
) -> ::c_int;
2212-
#[cfg_attr(
2213-
all(target_os = "macos", target_arch = "x86"),
2214-
link_name = "pthread_sigmask$UNIX2003"
2215-
)]
22162205
pub fn pthread_sigmask(
22172206
how: ::c_int,
22182207
set: *const sigset_t,
@@ -2223,29 +2212,20 @@ extern "C" {
22232212
pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
22242213
pub fn sem_unlink(name: *const ::c_char) -> ::c_int;
22252214
pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int;
2226-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwnam_r50")]
2227-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwnam_r")]
22282215
pub fn getpwnam_r(
22292216
name: *const ::c_char,
22302217
pwd: *mut passwd,
22312218
buf: *mut ::c_char,
22322219
buflen: ::size_t,
22332220
result: *mut *mut passwd,
22342221
) -> ::c_int;
2235-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwuid_r50")]
2236-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwuid_r")]
22372222
pub fn getpwuid_r(
22382223
uid: ::uid_t,
22392224
pwd: *mut passwd,
22402225
buf: *mut ::c_char,
22412226
buflen: ::size_t,
22422227
result: *mut *mut passwd,
22432228
) -> ::c_int;
2244-
#[cfg_attr(
2245-
all(target_os = "macos", target_arch = "x86"),
2246-
link_name = "sigwait$UNIX2003"
2247-
)]
2248-
#[cfg_attr(target_os = "solaris", link_name = "__posix_sigwait")]
22492229
pub fn sigwait(set: *const sigset_t, sig: *mut ::c_int) -> ::c_int;
22502230
pub fn pthread_atfork(
22512231
prepare: ::Option<unsafe extern "C" fn()>,
@@ -2259,10 +2239,6 @@ extern "C" {
22592239
value: *mut ::c_void,
22602240
) -> ::c_int;
22612241
pub fn getgrgid(gid: ::gid_t) -> *mut ::group;
2262-
#[cfg_attr(
2263-
all(target_os = "macos", target_arch = "x86"),
2264-
link_name = "popen$UNIX2003"
2265-
)]
22662242
pub fn popen(command: *const c_char, mode: *const c_char) -> *mut ::FILE;
22672243
pub fn uname(buf: *mut ::utsname) -> ::c_int;
22682244
}

0 commit comments

Comments
 (0)