diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-10-30 20:13:59 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-10-30 20:13:59 +0100 |
| commit | 10c4673df9e51862737285c87270245e025c8c1f (patch) | |
| tree | c6bdcdb6966e1435437cbb35302417f24eae60ea /libpthread/include/pthread/pthread.h | |
| parent | e15520309f5eeb86caeb32908b5da257f46aa1e6 (diff) | |
| parent | 916e61485d5434e0b4052832ca331cf0eb315538 (diff) | |
Merge branch 'libpthread-moved' into upstream-merged
Diffstat (limited to 'libpthread/include/pthread/pthread.h')
| -rw-r--r-- | libpthread/include/pthread/pthread.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libpthread/include/pthread/pthread.h b/libpthread/include/pthread/pthread.h index e6b92495..4dbcb0cb 100644 --- a/libpthread/include/pthread/pthread.h +++ b/libpthread/include/pthread/pthread.h @@ -48,6 +48,7 @@ #endif #include <sched.h> +#include <time.h> __BEGIN_DECLS @@ -377,11 +378,11 @@ extern int pthread_condattr_destroy (pthread_condattr_t *attr); #ifdef __USE_XOPEN2K /* Return the value of the clock attribute in *ATTR in *CLOCK_ID. */ extern int pthread_condattr_getclock (const pthread_condattr_t *__restrict attr, - clockid_t *__restrict clock_id); + __clockid_t *__restrict clock_id); /* Set the value of the clock attribute in *ATTR to CLOCK_ID. */ extern int pthread_condattr_setclock (pthread_condattr_t *attr, - clockid_t clock_id); + __clockid_t clock_id); #endif @@ -718,7 +719,7 @@ extern int pthread_kill (pthread_t thread, int signo); #ifdef __USE_XOPEN2K /* Return the thread cpu clock. */ -extern int pthread_getcpuclockid (pthread_t thread, clockid_t *clock); +extern int pthread_getcpuclockid (pthread_t thread, __clockid_t *clock); #endif |