2009-02-19 Basile Starynkevitch <basile@starynkevitch.net>

	MELT branch merged with trunk r144284



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@144287 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 39 insertions, 39 deletions

diff --git a/gcc/gthr-rtems.h b/gcc/gthr-rtems.h
index e926d534c5e..d15ad5e1976 100644
--- a/gcc/gthr-rtems.h
+++ b/gcc/gthr-rtems.h
@@ -1,7 +1,7 @@
 /* RTEMS threads compatibility routines for libgcc2 and libobjc.
    by: Rosimildo da Silva( rdasilva@connecttel.com ) */
 /* Compile this one with gcc.  */
-/* Copyright (C) 1997, 1999, 2000, 2002, 2003, 2005 
+/* Copyright (C) 1997, 1999, 2000, 2002, 2003, 2005, 2008, 2009
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -54,24 +54,24 @@ typedef void *__gthread_recursive_mutex_t;
  */
 
 /* generic per task variables */
-extern int rtems_gxx_once (__gthread_once_t *once, void (*func) (void));
-extern int rtems_gxx_key_create (__gthread_key_t *key, void (*dtor) (void *));
-extern int rtems_gxx_key_delete (__gthread_key_t key);
-extern void *rtems_gxx_getspecific (__gthread_key_t key);
-extern int rtems_gxx_setspecific (__gthread_key_t key, const void *ptr);
+extern int rtems_gxx_once (__gthread_once_t *__once, void (*__func) (void));
+extern int rtems_gxx_key_create (__gthread_key_t *__key, void (*__dtor) (void *));
+extern int rtems_gxx_key_delete (__gthread_key_t __key);
+extern void *rtems_gxx_getspecific (__gthread_key_t __key);
+extern int rtems_gxx_setspecific (__gthread_key_t __key, const void *__ptr);
 
 /* mutex support */
-extern void rtems_gxx_mutex_init (__gthread_mutex_t *mutex);
-extern int rtems_gxx_mutex_destroy (__gthread_mutex_t *mutex);
-extern int rtems_gxx_mutex_lock (__gthread_mutex_t *mutex);
-extern int rtems_gxx_mutex_trylock (__gthread_mutex_t *mutex);
-extern int rtems_gxx_mutex_unlock (__gthread_mutex_t *mutex);
+extern void rtems_gxx_mutex_init (__gthread_mutex_t *__mutex);
+extern int rtems_gxx_mutex_destroy (__gthread_mutex_t *__mutex);
+extern int rtems_gxx_mutex_lock (__gthread_mutex_t *__mutex);
+extern int rtems_gxx_mutex_trylock (__gthread_mutex_t *__mutex);
+extern int rtems_gxx_mutex_unlock (__gthread_mutex_t *__mutex);
 
 /* recursive mutex support */
-extern void rtems_gxx_recursive_mutex_init (__gthread_recursive_mutex_t *mutex);
-extern int rtems_gxx_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex);
-extern int rtems_gxx_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex);
-extern int rtems_gxx_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex);
+extern void rtems_gxx_recursive_mutex_init (__gthread_recursive_mutex_t *__mutex);
+extern int rtems_gxx_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex);
+extern int rtems_gxx_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex);
+extern int rtems_gxx_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex);
 
 /* RTEMS threading is always active */
 static inline int
@@ -82,75 +82,75 @@ __gthread_active_p (void)
 
 /* Wrapper calls */
 static inline int
-__gthread_once (__gthread_once_t *once, void (*func) (void))
+__gthread_once (__gthread_once_t *__once, void (*__func) (void))
 {
-   return rtems_gxx_once( once, func );
+   return rtems_gxx_once( __once, __func );
 }
 
 static inline int
-__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
+__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))
 {
-  return rtems_gxx_key_create( key, dtor );
+  return rtems_gxx_key_create( __key, __dtor );
 }
 
 static inline int
-__gthread_key_delete (__gthread_key_t key)
+__gthread_key_delete (__gthread_key_t __key)
 {
-  return rtems_gxx_key_delete (key);
+  return rtems_gxx_key_delete (__key);
 }
 
 static inline void *
-__gthread_getspecific (__gthread_key_t key)
+__gthread_getspecific (__gthread_key_t __key)
 {
-  return rtems_gxx_getspecific (key);
+  return rtems_gxx_getspecific (__key);
 }
 
 static inline int
-__gthread_setspecific (__gthread_key_t key, const void *ptr)
+__gthread_setspecific (__gthread_key_t __key, const void *__ptr)
 {
-  return rtems_gxx_setspecific (key, ptr);
+  return rtems_gxx_setspecific (__key, __ptr);
 }
 
 static inline int
-__gthread_mutex_destroy (__gthread_mutex_t *mutex)
+__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
 {
-  return rtems_gxx_mutex_destroy (mutex);
+  return rtems_gxx_mutex_destroy (__mutex);
 }
 
 static inline int
-__gthread_mutex_lock (__gthread_mutex_t *mutex)
+__gthread_mutex_lock (__gthread_mutex_t *__mutex)
 {
-    return rtems_gxx_mutex_lock (mutex);
+    return rtems_gxx_mutex_lock (__mutex);
 }
 
 static inline int
-__gthread_mutex_trylock (__gthread_mutex_t *mutex)
+__gthread_mutex_trylock (__gthread_mutex_t *__mutex)
 {
-    return rtems_gxx_mutex_trylock (mutex);
+    return rtems_gxx_mutex_trylock (__mutex);
 }
 
 static inline int
-__gthread_mutex_unlock (__gthread_mutex_t *mutex)
+__gthread_mutex_unlock (__gthread_mutex_t *__mutex)
 {
-    return rtems_gxx_mutex_unlock( mutex );
+    return rtems_gxx_mutex_unlock( __mutex );
 }
 
 static inline int
-__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
 {
-    return rtems_gxx_recursive_mutex_lock (mutex);
+    return rtems_gxx_recursive_mutex_lock (__mutex);
 }
 
 static inline int
-__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
 {
-    return rtems_gxx_recursive_mutex_trylock (mutex);
+    return rtems_gxx_recursive_mutex_trylock (__mutex);
 }
 
 static inline int
-__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
 {
-    return rtems_gxx_recursive_mutex_unlock( mutex );
+    return rtems_gxx_recursive_mutex_unlock( __mutex );
 }
 
 #ifdef __cplusplus