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/sysdeps/generic | |
| parent | e15520309f5eeb86caeb32908b5da257f46aa1e6 (diff) | |
| parent | 916e61485d5434e0b4052832ca331cf0eb315538 (diff) | |
Merge branch 'libpthread-moved' into upstream-merged
Diffstat (limited to 'libpthread/sysdeps/generic')
| -rw-r--r-- | libpthread/sysdeps/generic/bits/condition-attr.h | 4 | ||||
| -rw-r--r-- | libpthread/sysdeps/generic/pt-attr-getschedparam.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libpthread/sysdeps/generic/bits/condition-attr.h b/libpthread/sysdeps/generic/bits/condition-attr.h index a1311286..4cd4e8c4 100644 --- a/libpthread/sysdeps/generic/bits/condition-attr.h +++ b/libpthread/sysdeps/generic/bits/condition-attr.h @@ -20,7 +20,7 @@ #ifndef _BITS_CONDITION_ATTR_H #define _BITS_CONDITION_ATTR_H 1 -#include <time.h> +#include <bits/types.h> enum __pthread_process_shared; @@ -28,7 +28,7 @@ enum __pthread_process_shared; struct __pthread_condattr { enum __pthread_process_shared pshared; - clockid_t clock; + __clockid_t clock; }; #endif /* bits/condition.h */ diff --git a/libpthread/sysdeps/generic/pt-attr-getschedparam.c b/libpthread/sysdeps/generic/pt-attr-getschedparam.c index 6c3f15be..190cf9d0 100644 --- a/libpthread/sysdeps/generic/pt-attr-getschedparam.c +++ b/libpthread/sysdeps/generic/pt-attr-getschedparam.c @@ -19,6 +19,7 @@ #include <pthread.h> #include <sched.h> +#include <string.h> #include <pt-internal.h> |