Skip to content

Commit 2f5ed5d

Browse files
committed
Auto merge of #1525 - newpavlov:patch-4, r=gnzlbg
pthread_exit return type fix Closes: #1520
2 parents c443f1a + 7d1907e commit 2f5ed5d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/fuchsia/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3732,7 +3732,7 @@ extern "C" {
37323732
native: ::pthread_t,
37333733
value: *mut *mut ::c_void,
37343734
) -> ::c_int;
3735-
pub fn pthread_exit(value: *mut ::c_void);
3735+
pub fn pthread_exit(value: *mut ::c_void) -> !;
37363736
pub fn pthread_attr_init(attr: *mut ::pthread_attr_t) -> ::c_int;
37373737
pub fn pthread_attr_destroy(attr: *mut ::pthread_attr_t) -> ::c_int;
37383738
pub fn pthread_attr_setstacksize(

src/unix/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ extern "C" {
10481048
native: ::pthread_t,
10491049
value: *mut *mut ::c_void,
10501050
) -> ::c_int;
1051-
pub fn pthread_exit(value: *mut ::c_void);
1051+
pub fn pthread_exit(value: *mut ::c_void) -> !;
10521052
pub fn pthread_attr_init(attr: *mut ::pthread_attr_t) -> ::c_int;
10531053
pub fn pthread_attr_destroy(attr: *mut ::pthread_attr_t) -> ::c_int;
10541054
pub fn pthread_attr_setstacksize(

src/vxworks/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ extern "C" {
13181318
pub fn flock(fd: ::c_int, operation: ::c_int) -> ::c_int;
13191319

13201320
pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::c_void) -> ::c_int;
1321-
pub fn pthread_exit(value: *mut ::c_void);
1321+
pub fn pthread_exit(value: *mut ::c_void) -> !;
13221322
pub fn pthread_attr_setdetachstate(
13231323
attr: *mut ::pthread_attr_t,
13241324
state: ::c_int,

0 commit comments

Comments
 (0)