diff options
| author | bors <bors@rust-lang.org> | 2019-09-20 09:43:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-20 09:43:36 +0000 |
| commit | 2f5ed5d9b3f5e658074dac2d3b919d0e33266205 (patch) | |
| tree | 604d21eb7be48dd75dcee34db52dce8755744aac | |
| parent | c443f1a9aa001f837c37273beab6aa8945673ba1 (diff) | |
| parent | 7d1907eaae83b9946f5e6c5ee79ce6650a3b9a75 (diff) | |
| download | rust-libc-2f5ed5d9b3f5e658074dac2d3b919d0e33266205.tar.gz | |
Auto merge of #1525 - newpavlov:patch-4, r=gnzlbg
pthread_exit return type fix
Closes: #1520
| -rw-r--r-- | src/fuchsia/mod.rs | 2 | ||||
| -rw-r--r-- | src/unix/mod.rs | 2 | ||||
| -rwxr-xr-x | src/vxworks/mod.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/fuchsia/mod.rs b/src/fuchsia/mod.rs index 5d302aaf88..7d23e67106 100644 --- a/src/fuchsia/mod.rs +++ b/src/fuchsia/mod.rs @@ -3732,7 +3732,7 @@ extern "C" { native: ::pthread_t, value: *mut *mut ::c_void, ) -> ::c_int; - pub fn pthread_exit(value: *mut ::c_void); + pub fn pthread_exit(value: *mut ::c_void) -> !; pub fn pthread_attr_init(attr: *mut ::pthread_attr_t) -> ::c_int; pub fn pthread_attr_destroy(attr: *mut ::pthread_attr_t) -> ::c_int; pub fn pthread_attr_setstacksize( diff --git a/src/unix/mod.rs b/src/unix/mod.rs index 8d78cea726..15656de95f 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -1048,7 +1048,7 @@ extern "C" { native: ::pthread_t, value: *mut *mut ::c_void, ) -> ::c_int; - pub fn pthread_exit(value: *mut ::c_void); + pub fn pthread_exit(value: *mut ::c_void) -> !; pub fn pthread_attr_init(attr: *mut ::pthread_attr_t) -> ::c_int; pub fn pthread_attr_destroy(attr: *mut ::pthread_attr_t) -> ::c_int; pub fn pthread_attr_setstacksize( diff --git a/src/vxworks/mod.rs b/src/vxworks/mod.rs index a25b1d598f..0325c5402b 100755 --- a/src/vxworks/mod.rs +++ b/src/vxworks/mod.rs @@ -1318,7 +1318,7 @@ extern "C" { pub fn flock(fd: ::c_int, operation: ::c_int) -> ::c_int; pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::c_void) -> ::c_int; - pub fn pthread_exit(value: *mut ::c_void); + pub fn pthread_exit(value: *mut ::c_void) -> !; pub fn pthread_attr_setdetachstate( attr: *mut ::pthread_attr_t, state: ::c_int, |