Synch with trunk at rev 22997.

Basically trailing whitespaces removal, fix non standard keywords
asm -> __asm__ inline -> __inline__ and some minor changes on trunk.

Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/libpthread/linuxthreads.old/internals.h b/libpthread/linuxthreads.old/internals.h
index ab227d6cc..38290a5fe 100644
--- a/libpthread/linuxthreads.old/internals.h
+++ b/libpthread/linuxthreads.old/internals.h
@@ -34,7 +34,7 @@
 #include <bits/uClibc_locale.h>
 #endif /* __UCLIBC_HAS_XLOCALE__ */
 
-/* Use a funky version in a probably vein attempt at preventing gdb 
+/* Use a funky version in a probably vein attempt at preventing gdb
  * from dlopen()'ing glibc's libthread_db library... */
 #define STRINGIFY(s) STRINGIFY2 (s)
 #define STRINGIFY2(s) #s
@@ -305,14 +305,14 @@ extern volatile pthread_descr __pthread_last_event;
 
 /* Return the handle corresponding to a thread id */
 
-static inline pthread_handle thread_handle(pthread_t id)
+static __inline__ pthread_handle thread_handle(pthread_t id)
 {
   return &__pthread_handles[id % PTHREAD_THREADS_MAX];
 }
 
 /* Validate a thread handle. Must have acquired h->h_spinlock before. */
 
-static inline int invalid_handle(pthread_handle h, pthread_t id)
+static __inline__ int invalid_handle(pthread_handle h, pthread_t id)
 {
   return h->h_descr == NULL || h->h_descr->p_tid != id;
 }
@@ -381,8 +381,8 @@ extern size_t __pagesize;
 
 extern pthread_descr __pthread_find_self (void) __attribute__ ((const));
 
-static inline pthread_descr thread_self (void) __attribute__ ((const));
-static inline pthread_descr thread_self (void)
+static __inline__ pthread_descr thread_self (void) __attribute__ ((const));
+static __inline__ pthread_descr thread_self (void)
 {
 #ifdef THREAD_SELF
   return THREAD_SELF;