Merge pull request rust-lang#580 from anatol/pub_restorer

alexcrichton · web-flow · commit 9fe8ac470662 · 2017-05-01T20:52:18.000+03:00
Make sigaction._restorer public
diff --git a/src/unix/notbsd/android/b64/mod.rs b/src/unix/notbsd/android/b64/mod.rs
@@ -16,7 +16,7 @@ s! {
         pub sa_flags: ::c_uint,
         pub sa_sigaction: ::sighandler_t,
         pub sa_mask: ::sigset_t,
-        _restorer: *mut ::c_void,
+        pub sa_restorer: ::dox::Option<extern fn()>,
     }
 
     pub struct rlimit64 {
diff --git a/src/unix/notbsd/linux/mips/mips32.rs b/src/unix/notbsd/linux/mips/mips32.rs
@@ -86,7 +86,7 @@ s! {
         pub sa_flags: ::c_int,
         pub sa_sigaction: ::sighandler_t,
         pub sa_mask: sigset_t,
-        _restorer: *mut ::c_void,
+        pub sa_restorer: ::dox::Option<extern fn()>,
         _resv: [::c_int; 1],
     }
 
diff --git a/src/unix/notbsd/linux/mips/mips64.rs b/src/unix/notbsd/linux/mips/mips64.rs
@@ -85,7 +85,7 @@ s! {
         pub sa_flags: ::c_int,
         pub sa_sigaction: ::sighandler_t,
         pub sa_mask: sigset_t,
-        _restorer: *mut ::c_void,
+        pub sa_restorer: ::dox::Option<extern fn()>,
     }
 
     pub struct stack_t {
diff --git a/src/unix/notbsd/linux/musl/mod.rs b/src/unix/notbsd/linux/musl/mod.rs
@@ -35,7 +35,7 @@ s! {
         pub sa_sigaction: ::sighandler_t,
         pub sa_mask: ::sigset_t,
         pub sa_flags: ::c_int,
-        _restorer: *mut ::c_void,
+        pub sa_restorer: ::dox::Option<extern fn()>,
     }
 
     pub struct ipc_perm {
diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs
@@ -70,7 +70,7 @@ s! {
         #[cfg(target_arch = "sparc64")]
         __reserved0: ::c_int,
         pub sa_flags: ::c_int,
-        _restorer: *mut ::c_void,
+        pub sa_restorer: ::dox::Option<extern fn()>,
     }
 
     pub struct stack_t {
diff --git a/src/unix/notbsd/linux/s390x.rs b/src/unix/notbsd/linux/s390x.rs
@@ -86,7 +86,7 @@ s! {
         pub sa_sigaction: ::sighandler_t,
         __glibc_reserved0: ::c_int,
         pub sa_flags: ::c_int,
-        _restorer: *mut ::c_void,
+        pub sa_restorer: ::dox::Option<extern fn()>,
         pub sa_mask: sigset_t,
     }
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ s! {`
`16`	`16`	`pub sa_flags: ::c_uint,`
`17`	`17`	`pub sa_sigaction: ::sighandler_t,`
`18`	`18`	`pub sa_mask: ::sigset_t,`
`19`		`- _restorer: *mut ::c_void,`
	`19`	`+ pub sa_restorer: ::dox::Option<extern fn()>,`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`pub struct rlimit64 {`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ s! {`
`86`	`86`	`pub sa_flags: ::c_int,`
`87`	`87`	`pub sa_sigaction: ::sighandler_t,`
`88`	`88`	`pub sa_mask: sigset_t,`
`89`		`- _restorer: *mut ::c_void,`
	`89`	`+ pub sa_restorer: ::dox::Option<extern fn()>,`
`90`	`90`	`_resv: [::c_int; 1],`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ s! {`
`85`	`85`	`pub sa_flags: ::c_int,`
`86`	`86`	`pub sa_sigaction: ::sighandler_t,`
`87`	`87`	`pub sa_mask: sigset_t,`
`88`		`- _restorer: *mut ::c_void,`
	`88`	`+ pub sa_restorer: ::dox::Option<extern fn()>,`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`pub struct stack_t {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ s! {`
`35`	`35`	`pub sa_sigaction: ::sighandler_t,`
`36`	`36`	`pub sa_mask: ::sigset_t,`
`37`	`37`	`pub sa_flags: ::c_int,`
`38`		`- _restorer: *mut ::c_void,`
	`38`	`+ pub sa_restorer: ::dox::Option<extern fn()>,`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`pub struct ipc_perm {`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ s! {`
`70`	`70`	`#[cfg(target_arch = "sparc64")]`
`71`	`71`	`__reserved0: ::c_int,`
`72`	`72`	`pub sa_flags: ::c_int,`
`73`		`- _restorer: *mut ::c_void,`
	`73`	`+ pub sa_restorer: ::dox::Option<extern fn()>,`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`pub struct stack_t {`