Skip to content

Commit d0b6889

Browse files
Andrew HsiehGerrit Code Review
authored andcommitted
Merge "<pthread.h>: Mark pthread_exit() as __noreturn"
2 parents db52487 + effaa95 commit d0b6889

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

ndk/platforms/android-3/include/pthread.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,9 @@ int pthread_getattr_np(pthread_t thid, pthread_attr_t * attr);
138138

139139
int pthread_create(pthread_t *thread, pthread_attr_t const * attr,
140140
void *(*start_routine)(void *), void * arg);
141-
void pthread_exit(void * retval);
141+
142+
__noreturn void pthread_exit(void * retval);
143+
142144
int pthread_join(pthread_t thid, void ** ret_val);
143145
int pthread_detach(pthread_t thid);
144146

ndk/platforms/android-5/include/pthread.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,9 @@ int pthread_getattr_np(pthread_t thid, pthread_attr_t * attr);
138138

139139
int pthread_create(pthread_t *thread, pthread_attr_t const * attr,
140140
void *(*start_routine)(void *), void * arg);
141-
void pthread_exit(void * retval);
141+
142+
__noreturn void pthread_exit(void * retval);
143+
142144
int pthread_join(pthread_t thid, void ** ret_val);
143145
int pthread_detach(pthread_t thid);
144146

ndk/platforms/android-8/include/pthread.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,9 @@ int pthread_getattr_np(pthread_t thid, pthread_attr_t * attr);
138138

139139
int pthread_create(pthread_t *thread, pthread_attr_t const * attr,
140140
void *(*start_routine)(void *), void * arg);
141-
void pthread_exit(void * retval);
141+
142+
__noreturn void pthread_exit(void * retval);
143+
142144
int pthread_join(pthread_t thid, void ** ret_val);
143145
int pthread_detach(pthread_t thid);
144146

ndk/platforms/android-9/include/pthread.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ int pthread_getattr_np(pthread_t thid, pthread_attr_t * attr);
142142

143143
int pthread_create(pthread_t *thread, pthread_attr_t const * attr,
144144
void *(*start_routine)(void *), void * arg);
145-
void pthread_exit(void * retval);
145+
146+
__noreturn void pthread_exit(void * retval);
147+
146148
int pthread_join(pthread_t thid, void ** ret_val);
147149
int pthread_detach(pthread_t thid);
148150

0 commit comments

Comments
 (0)