summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-02-15 10:20:06 -0800
committerAlex Crichton <alex@alexcrichton.com>2016-02-15 10:20:06 -0800
commitafb1f1a3867a0978f3e3e4dc620e341406703702 (patch)
treeb2863eab8ea9d234595a39dd5f7be83ef835afb5
parent0668b9c91a5c0f81f446e1f9ac5e6141660c9b8e (diff)
parent26e1ec1b76c6bbb053626aa4e6fed9851afef8df (diff)
downloadrust-libc-afb1f1a3867a0978f3e3e4dc620e341406703702.tar.gz
Merge branch 'sigaltstack-flags' of https://github.com/tmiasko/libc into merge
-rw-r--r--src/unix/bsd/mod.rs3
-rw-r--r--src/unix/notbsd/mod.rs3
-rw-r--r--src/unix/solaris/mod.rs3
3 files changed, 9 insertions, 0 deletions
diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs
index 2a0104c209..d6752a5f9f 100644
--- a/src/unix/bsd/mod.rs
+++ b/src/unix/bsd/mod.rs
@@ -120,6 +120,9 @@ pub const SA_NOCLDSTOP: ::c_int = 0x0008;
pub const SA_NODEFER: ::c_int = 0x0010;
pub const SA_NOCLDWAIT: ::c_int = 0x0020;
+pub const SS_ONSTACK: ::c_int = 1;
+pub const SS_DISABLE: ::c_int = 4;
+
pub const SIGCHLD: ::c_int = 20;
pub const SIGBUS: ::c_int = 10;
pub const SIGUSR1: ::c_int = 30;
diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs
index 5c682a92e7..12cff8352c 100644
--- a/src/unix/notbsd/mod.rs
+++ b/src/unix/notbsd/mod.rs
@@ -385,6 +385,9 @@ pub const SA_RESETHAND: ::c_int = 0x80000000;
pub const SA_RESTART: ::c_int = 0x10000000;
pub const SA_NOCLDSTOP: ::c_int = 0x00000001;
+pub const SS_ONSTACK: ::c_int = 1;
+pub const SS_DISABLE: ::c_int = 2;
+
pub const PATH_MAX: ::c_int = 4096;
pub const FD_SETSIZE: usize = 1024;
diff --git a/src/unix/solaris/mod.rs b/src/unix/solaris/mod.rs
index c6596f1f23..4587a89ee1 100644
--- a/src/unix/solaris/mod.rs
+++ b/src/unix/solaris/mod.rs
@@ -281,6 +281,9 @@ pub const SA_NODEFER: ::c_int = 0x00000010;
pub const SA_NOCLDWAIT: ::c_int = 0x00010000;
pub const SA_NOCLDSTOP: ::c_int = 0x00020000;
+pub const SS_ONSTACK: ::c_int = 1;
+pub const SS_DISABLE: ::c_int = 2;
+
pub const FIONBIO: ::c_int = 0x8004667e;
pub const SIGCHLD: ::c_int = 18;