Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix android SA_* constants #511

Merged
merged 1 commit into from
May 25, 2019
Merged

Fix android SA_* constants #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/unix/notbsd/android/b32/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,15 @@ s! {
}
}

// These constants must be of the same type of sigaction.sa_flags
pub const SA_NOCLDSTOP: ::c_ulong = 0x00000001;
pub const SA_NOCLDWAIT: ::c_ulong = 0x00000002;
pub const SA_NODEFER: ::c_ulong = 0x40000000;
pub const SA_ONSTACK: ::c_ulong = 0x08000000;
pub const SA_RESETHAND: ::c_ulong = 0x80000000;
pub const SA_RESTART: ::c_ulong = 0x10000000;
pub const SA_SIGINFO: ::c_ulong = 0x00000004;

pub const RTLD_GLOBAL: ::c_int = 2;
pub const RTLD_NOW: ::c_int = 0;
pub const RTLD_DEFAULT: *mut ::c_void = -1isize as *mut ::c_void;
Expand Down
9 changes: 9 additions & 0 deletions src/unix/notbsd/android/b64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,15 @@ cfg_if! {
}
}

// These constants must be of the same type of sigaction.sa_flags
pub const SA_NOCLDSTOP: ::c_uint = 0x00000001;
pub const SA_NOCLDWAIT: ::c_uint = 0x00000002;
pub const SA_NODEFER: ::c_uint = 0x40000000;
pub const SA_ONSTACK: ::c_uint = 0x08000000;
pub const SA_RESETHAND: ::c_uint = 0x80000000;
pub const SA_RESTART: ::c_uint = 0x10000000;
pub const SA_SIGINFO: ::c_uint = 0x00000004;

pub const RTLD_GLOBAL: ::c_int = 0x00100;
pub const RTLD_NOW: ::c_int = 2;
pub const RTLD_DEFAULT: *mut ::c_void = 0i64 as *mut ::c_void;
Expand Down
8 changes: 0 additions & 8 deletions src/unix/notbsd/android/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,11 +560,6 @@ pub const ECOMM: ::c_int = 70;
pub const EPROTO: ::c_int = 71;
pub const EDOTDOT: ::c_int = 73;

pub const SA_NODEFER: ::c_int = 0x40000000;
pub const SA_RESETHAND: ::c_int = 0x80000000;
pub const SA_RESTART: ::c_int = 0x10000000;
pub const SA_NOCLDSTOP: ::c_int = 0x00000001;

pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
pub const EPOLLONESHOT: ::c_int = 0x40000000;
pub const EPOLLRDHUP: ::c_int = 0x00002000;
Expand Down Expand Up @@ -745,9 +740,6 @@ pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;

pub const FIOCLEX: ::c_int = 0x5451;

pub const SA_ONSTACK: ::c_ulong = 0x08000000;
pub const SA_SIGINFO: ::c_ulong = 0x00000004;
pub const SA_NOCLDWAIT: ::c_ulong = 0x00000002;
pub const SIGCHLD: ::c_int = 17;
pub const SIGBUS: ::c_int = 7;
pub const SIGUSR1: ::c_int = 10;
Expand Down