10 files changed, 37 insertions, 37 deletions
diff --git a/sysdeps/generic/bits/barrier-attr.h b/sysdeps/generic/bits/barrier-attr.h
index a9900b7..7734069 100644
--- a/sysdeps/generic/bits/barrier-attr.h
+++ b/sysdeps/generic/bits/barrier-attr.h
@@ -26,7 +26,7 @@ enum __pthread_process_shared;
    Note that not all of them are supported on all systems.  */
 struct __pthread_barrierattr
 {
-  enum __pthread_process_shared pshared;
+  enum __pthread_process_shared __pshared;
 };
 
 #endif /* bits/barrier-attr.h */
diff --git a/sysdeps/generic/bits/barrier.h b/sysdeps/generic/bits/barrier.h
index 5e55931..dabe86f 100644
--- a/sysdeps/generic/bits/barrier.h
+++ b/sysdeps/generic/bits/barrier.h
@@ -25,14 +25,14 @@
 /* This structure describes the attributes of a POSIX barrier.  */
 struct __pthread_barrier
 {
-  __pthread_spinlock_t lock;
-  struct __pthread *queue; /* List of waiters.  */
-  unsigned pending;	/* Number of that still need to wait on
+  __pthread_spinlock_t __lock;
+  struct __pthread *__queue; /* List of waiters.  */
+  unsigned __pending;	/* Number of that still need to wait on
 			   barrier.  */
-  unsigned count;	/* Number of threads that must wait before
+  unsigned __count;	/* Number of threads that must wait before
 			   barrier is passed.  */
-  struct __pthread_barrierattr *attr;
-  void *data;
+  struct __pthread_barrierattr *__attr;
+  void *__data;
 };
 
 
diff --git a/sysdeps/generic/bits/cancelation.h b/sysdeps/generic/bits/cancelation.h
index 46486f5..1ed16c6 100644
--- a/sysdeps/generic/bits/cancelation.h
+++ b/sysdeps/generic/bits/cancelation.h
@@ -22,9 +22,9 @@
 
 struct __pthread_cancelation_handler
 {
-  void (*handler)(void *);
-  void *arg;
-  struct __pthread_cancelation_handler *next;
+  void (*__handler)(void *);
+  void *__arg;
+  struct __pthread_cancelation_handler *__next;
 };
 
 /* Returns the thread local location of the cleanup handler stack.  */
@@ -44,8 +44,8 @@ struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void);
 	  
 #define __pthread_cleanup_pop(execute) \
 	  if (execute) \
-	    __handler.handler (__handler.arg); \
-	  *__handlers = __handler.next; \
+	    __handler.__handler (__handler.__arg); \
+	  *__handlers = __handler.__next; \
 	}
 
 #endif /* _BITS_CANCELATION_H */
diff --git a/sysdeps/generic/bits/condition-attr.h b/sysdeps/generic/bits/condition-attr.h
index 4cd4e8c..19c92bb 100644
--- a/sysdeps/generic/bits/condition-attr.h
+++ b/sysdeps/generic/bits/condition-attr.h
@@ -27,8 +27,8 @@ enum __pthread_process_shared;
 /* User visible part of a condition attribute variable.  */
 struct __pthread_condattr
   {
-    enum __pthread_process_shared pshared;
-    __clockid_t clock;
+    enum __pthread_process_shared __pshared;
+    __clockid_t __clock;
   };
 
 #endif /* bits/condition.h */
diff --git a/sysdeps/generic/bits/mutex-attr.h b/sysdeps/generic/bits/mutex-attr.h
index 8514ebe..f3d0752 100644
--- a/sysdeps/generic/bits/mutex-attr.h
+++ b/sysdeps/generic/bits/mutex-attr.h
@@ -28,10 +28,10 @@ enum __pthread_mutex_type;
    attribute.  */
 struct __pthread_mutexattr
 {
-  int prioceiling;
-  enum __pthread_mutex_protocol protocol;
-  enum __pthread_process_shared pshared;
-  enum __pthread_mutex_type mutex_type;
+  int __prioceiling;
+  enum __pthread_mutex_protocol __protocol;
+  enum __pthread_process_shared __pshared;
+  enum __pthread_mutex_type __mutex_type;
 };
 
 /* Attributes for a recursive mutex.  */
diff --git a/sysdeps/generic/bits/mutex.h b/sysdeps/generic/bits/mutex.h
index c734c39..3120237 100644
--- a/sysdeps/generic/bits/mutex.h
+++ b/sysdeps/generic/bits/mutex.h
@@ -41,14 +41,14 @@ struct __pthread_mutex
     __pthread_spinlock_t __lock;
     /* In cthreads, mutex_init does not initialized thre third
        pointer, as such, we cannot rely on its value for anything.  */
-    char *cthreadscompat1;
+    char *__cthreadscompat1;
     struct __pthread *__queue;
-    struct __pthread_mutexattr *attr;
-    void *data;
+    struct __pthread_mutexattr *__attr;
+    void *__data;
     /*  Up to this point, we are completely compatible with cthreads
 	and what libc expects.  */
-    void *owner;
-    unsigned locks;
+    void *__owner;
+    unsigned __locks;
     /* If NULL then the default attributes apply.  */
   };
 
diff --git a/sysdeps/generic/bits/once.h b/sysdeps/generic/bits/once.h
index f4985d6..05895b9 100644
--- a/sysdeps/generic/bits/once.h
+++ b/sysdeps/generic/bits/once.h
@@ -24,8 +24,8 @@
 
 struct __pthread_once
 {
-  int run;
-  __pthread_spinlock_t lock;
+  int __run;
+  __pthread_spinlock_t __lock;
 };
 
 #define __PTHREAD_ONCE_INIT \
diff --git a/sysdeps/generic/bits/rwlock-attr.h b/sysdeps/generic/bits/rwlock-attr.h
index dba99f1..e78b91e 100644
--- a/sysdeps/generic/bits/rwlock-attr.h
+++ b/sysdeps/generic/bits/rwlock-attr.h
@@ -26,7 +26,7 @@ enum __pthread_process_shared;
    Note that not all of them are supported on all systems.  */
 struct __pthread_rwlockattr
 {
-  enum __pthread_process_shared pshared;
+  enum __pthread_process_shared __pshared;
 };
 
 #endif /* bits/rwlock-attr.h */
diff --git a/sysdeps/generic/bits/rwlock.h b/sysdeps/generic/bits/rwlock.h
index af6b1c8..bc27726 100644
--- a/sysdeps/generic/bits/rwlock.h
+++ b/sysdeps/generic/bits/rwlock.h
@@ -31,9 +31,9 @@ struct __pthread_rwlock
   {
     __pthread_spinlock_t __held;
     __pthread_spinlock_t __lock;
-    int readers;
-    struct __pthread *readerqueue;
-    struct __pthread *writerqueue;
+    int __readers;
+    struct __pthread *__readerqueue;
+    struct __pthread *__writerqueue;
     struct __pthread_rwlockattr *__attr;
     void *__data;
   };
diff --git a/sysdeps/generic/bits/thread-attr.h b/sysdeps/generic/bits/thread-attr.h
index 9a8fb75..d9456b0 100644
--- a/sysdeps/generic/bits/thread-attr.h
+++ b/sysdeps/generic/bits/thread-attr.h
@@ -34,14 +34,14 @@ enum __pthread_contentionscope;
    that not all of them are supported on all systems.  */
 struct __pthread_attr
 {
-  struct __sched_param schedparam;
-  void *stackaddr;
-  size_t stacksize;
-  size_t guardsize;
-  enum __pthread_detachstate detachstate;
-  enum __pthread_inheritsched inheritsched;
-  enum __pthread_contentionscope contentionscope;
-  int schedpolicy;
+  struct __sched_param __schedparam;
+  void *__stackaddr;
+  size_t __stacksize;
+  size_t __guardsize;
+  enum __pthread_detachstate __detachstate;
+  enum __pthread_inheritsched __inheritsched;
+  enum __pthread_contentionscope __contentionscope;
+  int __schedpolicy;
 };
 
 #endif /* bits/thread-attr.h */