summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-10-13 01:31:30 +0000
committerEric Andersen <andersen@codepoet.org>2002-10-13 01:31:30 +0000
commit0f9603991c8c94c318c85a759704b25f13edef1b (patch)
tree4b1a291ed43b956967bc2956d874d240c97b74b9 /include
parentd3077ff7af4bf39ad259d36b4f50302b15292233 (diff)
It turns out that __thread is now a gcc keyword. We used __thread in
a few spots in our header files. In this change I do a s/__thread/__thread_id/ so we no longer conflict with newer CVS versions of gcc (such as the patched up gcc 3.2 included with RedHat 3.0). -Erik
Diffstat (limited to 'include')
-rw-r--r--include/pthread.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pthread.h b/include/pthread.h
index 0f7f50e10..2b7b79834 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -160,7 +160,7 @@ enum
/* Create a thread with given attributes ATTR (or default attributes
if ATTR is NULL), and call function START_ROUTINE with given
arguments ARG. */
-extern int pthread_create (pthread_t *__restrict __thread,
+extern int pthread_create (pthread_t *__restrict __thread_id,
__const pthread_attr_t *__restrict __attr,
void *(*__start_routine) (void *),
void *__restrict __arg) __THROW;
@@ -588,7 +588,7 @@ extern int pthread_setcancelstate (int __state, int *__oldstate) __THROW;
extern int pthread_setcanceltype (int __type, int *__oldtype) __THROW;
/* Cancel THREAD immediately or at the next possibility. */
-extern int pthread_cancel (pthread_t __thread) __THROW;
+extern int pthread_cancel (pthread_t __thread_id) __THROW;
/* Test for pending cancellation for the current thread and terminate
the thread as per pthread_exit(PTHREAD_CANCELED) if it has been