diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-08-23 19:06:18 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-08-23 19:06:18 +0200 |
| commit | c2a1b325b7b2ce0d3d16bd1e9430e1d7eddce71e (patch) | |
| tree | 8f3a7d6f2537f7cc54d51a90ce3864b909cb03e4 /include/pthread | |
| parent | a6bb8f89d9569a3ecb0cefb892fd981481a8e976 (diff) | |
Use __clockid_t instead of clockid_t
Using clockid_t just for pthread types makes us pull <time.h>, which defines
time(), which may conflict with applications.
* include/pthread/pthread.h (pthread_condattr_getclock,
pthread_condattr_setclock, pthread_getcpuclockid): Use __clockid_t instead
of clockid_t.
* include/pthread/pthreadtypes.h: Include <bits/types.h>, instead of <time.h>
and defining clockid_t ourself when not defined by time.h.
* sysdeps/generic/bits/condition-attr.h: Include <bits/types.h> instead of
<time.h>.
(__pthread_condattr): Use __clockid_t instead of clockid_t.
Diffstat (limited to 'include/pthread')
| -rw-r--r-- | include/pthread/pthread.h | 6 | ||||
| -rw-r--r-- | include/pthread/pthreadtypes.h | 13 |
2 files changed, 4 insertions, 15 deletions
diff --git a/include/pthread/pthread.h b/include/pthread/pthread.h index e6b9249..67b8fe4 100644 --- a/include/pthread/pthread.h +++ b/include/pthread/pthread.h @@ -377,11 +377,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 +718,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 diff --git a/include/pthread/pthreadtypes.h b/include/pthread/pthreadtypes.h index 471e08e..33bd009 100644 --- a/include/pthread/pthreadtypes.h +++ b/include/pthread/pthreadtypes.h @@ -25,18 +25,7 @@ #include <features.h> -#define __need_clockid_t -#include <time.h> - -/* If we are in a mode where clockid_t is not automatically defined - and another header has already included <time.h> then defining - __need_clockid_t was not enough. */ -#ifndef __clockid_t_defined -# define __clockid_t_defined 1 -# include <bits/types.h> -/* Clock ID used in clock and timer functions. */ -typedef __clockid_t clockid_t; -#endif +#include <bits/types.h> __BEGIN_DECLS |