diff options
| author | Eric Andersen <andersen@codepoet.org> | 2002-10-13 01:31:30 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2002-10-13 01:31:30 +0000 |
| commit | 0f9603991c8c94c318c85a759704b25f13edef1b (patch) | |
| tree | 4b1a291ed43b956967bc2956d874d240c97b74b9 | |
| parent | d3077ff7af4bf39ad259d36b4f50302b15292233 (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
| -rw-r--r-- | include/pthread.h | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/bits/sigthread.h | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h | 2 |
3 files changed, 4 insertions, 4 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 diff --git a/libc/sysdeps/linux/common/bits/sigthread.h b/libc/sysdeps/linux/common/bits/sigthread.h index b86e75f20..0a634ac68 100644 --- a/libc/sysdeps/linux/common/bits/sigthread.h +++ b/libc/sysdeps/linux/common/bits/sigthread.h @@ -33,6 +33,6 @@ extern int pthread_sigmask (int __how, __sigset_t *__restrict __oldmask)__THROW; /* Send signal SIGNO to the given thread. */ -extern int pthread_kill (pthread_t __thread, int __signo) __THROW; +extern int pthread_kill (pthread_t __thread_id, int __signo) __THROW; #endif /* bits/sigthread.h */ diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h index c9b1dcf1b..36b11b040 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/bits/sigthread.h @@ -32,6 +32,6 @@ extern int pthread_sigmask __P ((int __how, __const __sigset_t *__newmask, __sigset_t *__oldmask)); /* Send signal SIGNO to the given thread. */ -extern int pthread_kill __P ((pthread_t __thread, int __signo)); +extern int pthread_kill __P ((pthread_t __thread_id, int __signo)); #endif /* bits/sigthread.h */ |