Skip to content

Commit 60f90cf

Browse files
committed
Auto merge of #237 - Nercury:use-signal-instead-of-bsd-signal, r=alexcrichton
Use now available link name "signal" instead of "bsd_signal" On android, the `bsd_signal` is gone, the `signal` is available. While this is the most obvious solution, I am not sure of a few things: - How are we going to keep compatibility with older NDKs where `signal` does not exist; - Was something dependent on this being different on android and thus would break (for example, the rust compiler uses this function, so it may break somewhere). Fixes #236.
2 parents f4411ad + 0b7ccdd commit 60f90cf

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

libc-test/build.rs

-6
Original file line numberDiff line numberDiff line change
@@ -397,12 +397,6 @@ fn main() {
397397

398398
cfg.skip_fn_ptrcheck(move |name| {
399399
match name {
400-
// This used to be called bsd_signal in rev 18 of the android
401-
// platform and is now just called signal, the old `bsd_signal`
402-
// symbol, however, still remains, just gives a different function
403-
// pointer.
404-
"signal" if android => true,
405-
406400
// dllimport weirdness?
407401
_ if windows => true,
408402

src/unix/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,6 @@ extern {
411411

412412
pub fn ftruncate(fd: ::c_int, length: off_t) -> ::c_int;
413413

414-
#[cfg_attr(target_os = "android", link_name = "bsd_signal")]
415414
pub fn signal(signum: ::c_int, handler: sighandler_t) -> sighandler_t;
416415

417416
#[cfg_attr(all(target_os = "macos", target_arch = "x86"),

0 commit comments

Comments
 (0)