diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-10 19:02:21 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-10 19:02:21 -0500 |
| commit | 356fa562ec9ac9cb16719396e85ddd044b3c6ebc (patch) | |
| tree | 22cb286524cbbd24f2e33068036d91d2f49953f1 | |
| parent | a0bfc9c78fcd26f81c62ac34f9085b6319a8099b (diff) | |
| download | glibc-356fa562ec9ac9cb16719396e85ddd044b3c6ebc.tar.gz | |
Consistently added return to pthread_exit
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/pthreadP.h | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread-functions.h | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 94ff351faf..fdc00d784f 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2012-01-10 Ulrich Drepper <drepper@gmail.com> + + * pthreadP.h: Add noreturn to __pthread_exit. + * sysdeps/pthread/pthread-functions.h: Likewise for ptr___pthread_exit. + 2011-12-30 Adhemerval Zanella <azanella@linux.vnet.ibm.com> * sysdeps/unix/sysv/linux/aio_misc.h (__aio_create_helper_thread): diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index e4a3c74ac9..df2a478318 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -501,7 +501,7 @@ extern int __pthread_atfork (void (*prepare) (void), void (*parent) (void), extern pthread_t __pthread_self (void); extern int __pthread_equal (pthread_t thread1, pthread_t thread2); extern int __pthread_kill (pthread_t threadid, int signo); -extern void __pthread_exit (void *value); +extern void __pthread_exit (void *value) __attribute__ ((__noreturn__)); extern int __pthread_setcanceltype (int type, int *oldtype); extern int __pthread_enable_asynccancel (void) attribute_hidden; extern void __pthread_disable_asynccancel (int oldtype) diff --git a/nptl/sysdeps/pthread/pthread-functions.h b/nptl/sysdeps/pthread/pthread-functions.h index 15a4dff142..5d77cb71d4 100644 --- a/nptl/sysdeps/pthread/pthread-functions.h +++ b/nptl/sysdeps/pthread/pthread-functions.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004, 2005, 2006, 2007, 2011 Free Software Foundation, Inc. +/* Copyright (C) 2003-2007, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. @@ -66,7 +66,7 @@ struct pthread_functions pthread_mutex_t *, const struct timespec *); int (*ptr_pthread_equal) (pthread_t, pthread_t); - void (*ptr___pthread_exit) (void *); + void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__)); int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *); int (*ptr_pthread_setschedparam) (pthread_t, int, const struct sched_param *); |