summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-04-06 16:50:11 -0700
committerbors <bors@rust-lang.org>2016-04-06 16:50:11 -0700
commit60f90cf560eeb92272cf2e22e80ed990445b8575 (patch)
tree889509ba4fad04202449762b82bed3ac1351204e
parentf4411ad7db204e3859dddf6a061f9a53eb43cbe5 (diff)
parent0b7ccdd11917810fb9d514a55ab20ea8cb44eb8e (diff)
downloadrust-libc-60f90cf560eeb92272cf2e22e80ed990445b8575.tar.gz
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.
-rw-r--r--libc-test/build.rs6
-rw-r--r--src/unix/mod.rs1
2 files changed, 0 insertions, 7 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs
index 06cdfe88f6..1685d22bd0 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -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,
diff --git a/src/unix/mod.rs b/src/unix/mod.rs
index a62ec74a30..de996b651a 100644
--- a/src/unix/mod.rs
+++ b/src/unix/mod.rs
@@ -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"),