This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
fix conflict with gcc thread local storage extension
- From: Mark Salter <msalter at redhat dot com>
- To: ecos-patches at sources dot redhat dot com
- Date: Thu, 20 Mar 2003 11:07:32 -0500 (EST)
- Subject: fix conflict with gcc thread local storage extension
Index: compat/posix/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/compat/posix/current/ChangeLog,v
retrieving revision 1.43
diff -u -p -5 -r1.43 ChangeLog
--- compat/posix/current/ChangeLog 19 Mar 2003 14:17:20 -0000 1.43
+++ compat/posix/current/ChangeLog 20 Mar 2003 16:05:01 -0000
@@ -1,5 +1,10 @@
+2003-03-20 Mark Salter <msalter at redhat dot com>
+
+ * include/pthread.h: Avoid conflict with recently introduced gcc
+ __thread keyword.
+
2003-03-13 Bart Veer <bartv at ecoscentric dot com>
* include/export.h: Only export signal-related functions if
CYGPKG_POSIX_SIGNALS is enabled.
Index: compat/posix/current/include/pthread.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/compat/posix/current/include/pthread.h,v
retrieving revision 1.8
diff -u -p -5 -r1.8 pthread.h
--- compat/posix/current/include/pthread.h 4 Mar 2003 17:23:32 -0000 1.8
+++ compat/posix/current/include/pthread.h 20 Mar 2003 16:05:01 -0000
@@ -8,11 +8,11 @@
//
//=============================================================================
//####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
// Software Foundation; either version 2 or (at your option) any later version.
//
@@ -81,11 +81,11 @@
//-----------------------------------------------------------------------------
// 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);
// Get current thread id.
@@ -98,15 +98,15 @@ __externC int pthread_equal (pthread_t _
__externC void pthread_exit (void *__retval) CYGBLD_ATTRIB_NORET;
// 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.
// Initialize attributes object with default attributes:
@@ -185,16 +185,16 @@ __externC int pthread_attr_getstacksize
//-----------------------------------------------------------------------------
// 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);
@@ -276,11 +276,11 @@ __externC int pthread_setcancelstate (in
// Set cancel type of current thread to ASYNCHRONOUS or DEFERRED.
// Returns old type in *oldtype.
__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.
__externC void pthread_testcancel (void);
@@ -310,11 +310,11 @@ __externC void pthread_cleanup_pop_inner
// -------------------------------------------------------------------------
// 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
//-----------------------------------------------------------------------------
#endif // ifndef CYGONCE_PTHREAD_H
// End of pthread.h