@@ -45,7 +45,7 @@ pub const SIGEMT: libc::c_int = 7;
45
45
pub const NSIG : libc:: c_int = 32 ;
46
46
47
47
bitflags ! {
48
- flags SaFlag : libc:: c_int {
48
+ flags SaFlags : libc:: c_int {
49
49
const SA_NOCLDSTOP = libc:: SA_NOCLDSTOP ,
50
50
const SA_NOCLDWAIT = libc:: SA_NOCLDWAIT ,
51
51
const SA_NODEFER = libc:: SA_NODEFER ,
@@ -57,7 +57,7 @@ bitflags!{
57
57
}
58
58
59
59
bitflags ! {
60
- flags SigFlag : libc:: c_int {
60
+ flags SigFlags : libc:: c_int {
61
61
const SIG_BLOCK = libc:: SIG_BLOCK ,
62
62
const SIG_UNBLOCK = libc:: SIG_UNBLOCK ,
63
63
const SIG_SETMASK = libc:: SIG_SETMASK ,
@@ -111,7 +111,7 @@ impl SigSet {
111
111
/// Gets the currently blocked (masked) set of signals for the calling thread.
112
112
pub fn thread_get_mask ( ) -> Result < SigSet > {
113
113
let mut oldmask: SigSet = unsafe { mem:: uninitialized ( ) } ;
114
- try!( pthread_sigmask ( SigFlag :: empty ( ) , None , Some ( & mut oldmask) ) ) ;
114
+ try!( pthread_sigmask ( SigFlags :: empty ( ) , None , Some ( & mut oldmask) ) ) ;
115
115
Ok ( oldmask)
116
116
}
117
117
@@ -131,7 +131,7 @@ impl SigSet {
131
131
}
132
132
133
133
/// Sets the set of signals as the signal mask, and returns the old mask.
134
- pub fn thread_swap_mask ( & self , how : SigFlag ) -> Result < SigSet > {
134
+ pub fn thread_swap_mask ( & self , how : SigFlags ) -> Result < SigSet > {
135
135
let mut oldmask: SigSet = unsafe { mem:: uninitialized ( ) } ;
136
136
try!( pthread_sigmask ( how, Some ( self ) , Some ( & mut oldmask) ) ) ;
137
137
Ok ( oldmask)
@@ -170,7 +170,7 @@ pub struct SigAction {
170
170
impl SigAction {
171
171
/// This function will set or unset the flag `SA_SIGINFO` depending on the
172
172
/// type of the `handler` argument.
173
- pub fn new ( handler : SigHandler , flags : SaFlag , mask : SigSet ) -> SigAction {
173
+ pub fn new ( handler : SigHandler , flags : SaFlags , mask : SigSet ) -> SigAction {
174
174
let mut s = unsafe { mem:: uninitialized :: < libc:: sigaction > ( ) } ;
175
175
s. sa_sigaction = match handler {
176
176
SigHandler :: SigDfl => unsafe { mem:: transmute ( libc:: SIG_DFL ) } ,
@@ -212,7 +212,7 @@ pub unsafe fn sigaction(signum: SigNum, sigaction: &SigAction) -> Result<SigActi
212
212
///
213
213
/// For more information, visit the [pthread_sigmask](http://man7.org/linux/man-pages/man3/pthread_sigmask.3.html),
214
214
/// or [sigprocmask](http://man7.org/linux/man-pages/man2/sigprocmask.2.html) man pages.
215
- pub fn pthread_sigmask ( how : SigFlag ,
215
+ pub fn pthread_sigmask ( how : SigFlags ,
216
216
set : Option < & SigSet > ,
217
217
oldset : Option < & mut SigSet > ) -> Result < ( ) > {
218
218
if set. is_none ( ) && oldset. is_none ( ) {
0 commit comments