diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-10-30 20:14:18 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-10-30 20:14:18 +0100 |
| commit | d88d71c54992e93c812ad33bb2b9962c71a78fd7 (patch) | |
| tree | e478d8999e5a87dff31653c8d4a7ff6e828bfc64 /libpthread/sysdeps/generic/bits/condition-attr.h | |
| parent | 62e8551e80d71082c6e2ae74cca0b1a157beedce (diff) | |
| parent | 10c4673df9e51862737285c87270245e025c8c1f (diff) | |
Merge branch 'upstream-merged'
Diffstat (limited to 'libpthread/sysdeps/generic/bits/condition-attr.h')
| -rw-r--r-- | libpthread/sysdeps/generic/bits/condition-attr.h | 4 |
1 files changed, 2 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 */ |