diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-12-09 16:53:57 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-12-09 16:53:57 -0800 |
| commit | 8ebd4b8855981462a03f5930a1f8d712c021190f (patch) | |
| tree | 5dc072f6ecb41940b6f6c7bac2d690c9dd6a8030 /libpthread/nptl/pthreadP.h | |
| parent | 641e7e36ad0a9b2899b04f256c5b243ada7da279 (diff) | |
nptl: fix old style function declerations
also fix a few shadowed local warnings
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libpthread/nptl/pthreadP.h')
| -rw-r--r-- | libpthread/nptl/pthreadP.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libpthread/nptl/pthreadP.h b/libpthread/nptl/pthreadP.h index 45222f45e..61d59f601 100644 --- a/libpthread/nptl/pthreadP.h +++ b/libpthread/nptl/pthreadP.h @@ -108,8 +108,8 @@ extern int __pthread_debug attribute_hidden; /* Cancellation test. */ #define CANCELLATION_P(self) \ do { \ - int cancelhandling = THREAD_GETMEM (self, cancelhandling); \ - if (CANCEL_ENABLED_AND_CANCELED (cancelhandling)) \ + int _cancelhandling = THREAD_GETMEM (self, cancelhandling); \ + if (CANCEL_ENABLED_AND_CANCELED (_cancelhandling)) \ { \ THREAD_SETMEM (self, result, PTHREAD_CANCELED); \ __do_cancel (); \ @@ -308,8 +308,7 @@ extern int __pthread_mutex_trylock (pthread_mutex_t *_mutex); extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); extern int __pthread_mutex_lock_internal (pthread_mutex_t *__mutex) attribute_hidden; -extern int __pthread_mutex_cond_lock (pthread_mutex_t *__mutex) - attribute_hidden internal_function; +extern int __pthread_mutex_cond_lock (pthread_mutex_t *__mutex); extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); extern int __pthread_mutex_unlock_internal (pthread_mutex_t *__mutex) attribute_hidden; |