Skip to content

Commit b5234a4

Browse files
committed
Prevent double linking libutil
1 parent eba21f4 commit b5234a4

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

src/unix/bsd/freebsdlike/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -590,10 +590,6 @@ extern {
590590
timeout: *const ::timespec) -> ::c_int;
591591
pub fn sigwaitinfo(set: *const sigset_t,
592592
info: *mut siginfo_t) -> ::c_int;
593-
}
594-
595-
#[link(name = "util")]
596-
extern "C" {
597593
pub fn openpty(amaster: *mut ::c_int,
598594
aslave: *mut ::c_int,
599595
name: *mut ::c_char,

src/unix/bsd/openbsdlike/mod.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ pub const Q_SETQUOTA: ::c_int = 0x400;
376376

377377
pub const RTLD_GLOBAL: ::c_int = 0x100;
378378

379+
#[link(name = "util")]
379380
extern {
380381
pub fn mincore(addr: *mut ::c_void, len: ::size_t,
381382
vec: *mut ::c_char) -> ::c_int;
@@ -393,10 +394,6 @@ extern {
393394
flags: ::c_int) -> ::c_int;
394395
pub fn futimens(fd: ::c_int, times: *const ::timespec) -> ::c_int;
395396
pub fn fdatasync(fd: ::c_int) -> ::c_int;
396-
}
397-
398-
#[link(name = "util")]
399-
extern "C" {
400397
pub fn openpty(amaster: *mut ::c_int,
401398
aslave: *mut ::c_int,
402399
name: *mut ::c_char,

src/unix/notbsd/linux/mod.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ f! {
398398
}
399399
}
400400

401+
#[link(name = "util")]
401402
extern {
402403
pub fn shm_open(name: *const c_char, oflag: ::c_int,
403404
mode: mode_t) -> ::c_int;
@@ -531,10 +532,6 @@ extern {
531532
timeout: *const ::timespec) -> ::c_int;
532533
pub fn sigwaitinfo(set: *const sigset_t,
533534
info: *mut siginfo_t) -> ::c_int;
534-
}
535-
536-
#[link(name = "util")]
537-
extern "C" {
538535
pub fn openpty(amaster: *mut ::c_int,
539536
aslave: *mut ::c_int,
540537
name: *mut ::c_char,

0 commit comments

Comments
 (0)