Skip to content
Snippets Groups Projects
Commit 60f90cf5 authored by bors's avatar bors
Browse files

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.
parents f4411ad7 0b7ccdd1
No related branches found
No related tags found
No related merge requests found
......@@ -397,12 +397,6 @@ fn main() {
cfg.skip_fn_ptrcheck(move |name| {
match name {
// This used to be called bsd_signal in rev 18 of the android
// platform and is now just called signal, the old `bsd_signal`
// symbol, however, still remains, just gives a different function
// pointer.
"signal" if android => true,
// dllimport weirdness?
_ if windows => true,
......
......@@ -411,7 +411,6 @@ extern {
pub fn ftruncate(fd: ::c_int, length: off_t) -> ::c_int;
#[cfg_attr(target_os = "android", link_name = "bsd_signal")]
pub fn signal(signum: ::c_int, handler: sighandler_t) -> sighandler_t;
#[cfg_attr(all(target_os = "macos", target_arch = "x86"),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment