about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMara Bos <m-ou.se@m-ou.se>2020-10-07 20:38:25 +0200
committerMara Bos <m-ou.se@m-ou.se>2020-10-16 06:19:00 +0200
commit3f196dc137c378e727c6626e5a38b37e15fbbf70 (patch)
tree14e75d8999d965ab7312b2cd2c8bac0981f75707
parentba483c51dfc1d17c75dc4502397ad92c78a53e77 (diff)
downloadrust-3f196dc137c378e727c6626e5a38b37e15fbbf70.tar.gz
rust-3f196dc137c378e727c6626e5a38b37e15fbbf70.zip
Take sys/vxworks/cmath from sys/unix instead.
-rw-r--r--library/std/src/sys/vxworks/cmath.rs32
-rw-r--r--library/std/src/sys/vxworks/mod.rs1
2 files changed, 1 insertions, 32 deletions
diff --git a/library/std/src/sys/vxworks/cmath.rs b/library/std/src/sys/vxworks/cmath.rs
deleted file mode 100644
index f327b69fc75..00000000000
--- a/library/std/src/sys/vxworks/cmath.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-#![cfg(not(test))]
-
-use libc::{c_double, c_float};
-
-extern "C" {
-    pub fn acos(n: c_double) -> c_double;
-    pub fn acosf(n: c_float) -> c_float;
-    pub fn asin(n: c_double) -> c_double;
-    pub fn asinf(n: c_float) -> c_float;
-    pub fn atan(n: c_double) -> c_double;
-    pub fn atan2(a: c_double, b: c_double) -> c_double;
-    pub fn atan2f(a: c_float, b: c_float) -> c_float;
-    pub fn atanf(n: c_float) -> c_float;
-    pub fn cbrt(n: c_double) -> c_double;
-    pub fn cbrtf(n: c_float) -> c_float;
-    pub fn cosh(n: c_double) -> c_double;
-    pub fn coshf(n: c_float) -> c_float;
-    pub fn expm1(n: c_double) -> c_double;
-    pub fn expm1f(n: c_float) -> c_float;
-    pub fn fdim(a: c_double, b: c_double) -> c_double;
-    pub fn fdimf(a: c_float, b: c_float) -> c_float;
-    pub fn hypot(x: c_double, y: c_double) -> c_double;
-    pub fn hypotf(x: c_float, y: c_float) -> c_float;
-    pub fn log1p(n: c_double) -> c_double;
-    pub fn log1pf(n: c_float) -> c_float;
-    pub fn sinh(n: c_double) -> c_double;
-    pub fn sinhf(n: c_float) -> c_float;
-    pub fn tan(n: c_double) -> c_double;
-    pub fn tanf(n: c_float) -> c_float;
-    pub fn tanh(n: c_double) -> c_double;
-    pub fn tanhf(n: c_float) -> c_float;
-}
diff --git a/library/std/src/sys/vxworks/mod.rs b/library/std/src/sys/vxworks/mod.rs
index f4a811074ca..2d25efbd7e3 100644
--- a/library/std/src/sys/vxworks/mod.rs
+++ b/library/std/src/sys/vxworks/mod.rs
@@ -15,6 +15,7 @@ pub mod weak;
 pub mod alloc;
 #[path = "../unix/args.rs"]
 pub mod args;
+#[path = "../unix/cmath.rs"]
 pub mod cmath;
 #[path = "../unix/condvar.rs"]
 pub mod condvar;