--- a/packages/compat/posix/current/ChangeLog
+++ b/packages/compat/posix/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-20  Mark Salter  <msalter@redhat.com>
+
+	* include/pthread.h: Avoid conflict with recently introduced gcc
+	__thread keyword.
+
 2003-03-13  Bart Veer  <bartv@ecoscentric.com>
 
 	* include/export.h: Only export signal-related functions if

--- a/packages/compat/posix/current/include/pthread.h
+++ b/packages/compat/posix/current/include/pthread.h
@@ -10,7 +10,7 @@
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free
@@ -83,7 +83,7 @@
 // Thread creation and management.
 
 // Create a thread.
-__externC int pthread_create (pthread_t *__thread,
+__externC int pthread_create (pthread_t *__pthread,
                               const pthread_attr_t *__attr,
                               void *(*__start_routine) (void *),
                               void *__arg);
@@ -100,11 +100,11 @@
 // Wait for the thread to terminate. If thread_return is not NULL then
 // the retval from the thread's call to pthread_exit() is stored at
 // *thread_return.
-__externC int pthread_join (pthread_t __thread, void **__thread_return);
+__externC int pthread_join (pthread_t __pthread, void **__thread_return);
 
 // Set the detachstate of the thread to "detached". The thread then does not
 // need to be joined and its resources will be freed when it exits.
-__externC int pthread_detach (pthread_t __thread);
+__externC int pthread_detach (pthread_t __pthread);
 
 //-----------------------------------------------------------------------------
 // Thread attribute handling.
@@ -187,12 +187,12 @@
 // Thread scheduling controls
 
 // Set scheduling policy and parameters for the thread
-__externC int pthread_setschedparam (pthread_t __thread,
+__externC int pthread_setschedparam (pthread_t __pthread,
                                      int __policy,
                                      const struct sched_param *__param);
 
 // Get scheduling policy and parameters for the thread
-__externC int pthread_getschedparam (pthread_t __thread,
+__externC int pthread_getschedparam (pthread_t __pthread,
                                      int *__policy,
                                      struct sched_param *__param);
 
@@ -278,7 +278,7 @@ struct pthread_cleanup_buffer
 __externC int pthread_setcanceltype (int __type, int *__oldtype);
 
 // Cancel the thread.
-__externC int pthread_cancel (pthread_t __thread);
+__externC int pthread_cancel (pthread_t __pthread);
 
 // Test for a pending cancellation for the current thread and terminate
 // the thread if there is one.
@@ -312,7 +312,7 @@ struct pthread_cleanup_buffer
 // eCos-specific function to measure stack usage of the supplied thread
 
 #ifdef CYGFUN_KERNEL_THREADS_STACK_MEASUREMENT
-__externC size_t pthread_measure_stack_usage (pthread_t __thread);
+__externC size_t pthread_measure_stack_usage (pthread_t __pthread);
 #endif
 
 //-----------------------------------------------------------------------------