diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-10-30 20:10:37 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-10-30 20:10:37 +0100 |
| commit | 916e61485d5434e0b4052832ca331cf0eb315538 (patch) | |
| tree | c747e26d7149265ecf07489d7a740a76e6a0138a /libpthread/sysdeps/generic/bits | |
| parent | 532f60cb8ebdb47af86a4dbe7b551c5b5835f763 (diff) | |
| parent | 221b60d8f0cf39511d26e275b3a0e26a4bdc4f15 (diff) | |
Merge branch 'libpthread' into libpthread-moved
Diffstat (limited to 'libpthread/sysdeps/generic/bits')
| -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 */ |