From c2a1b325b7b2ce0d3d16bd1e9430e1d7eddce71e Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 23 Aug 2011 19:06:18 +0200
Subject: 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.
---
 include/pthread/pthreadtypes.h | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'include/pthread/pthreadtypes.h')

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
 
-- 
cgit v1.2.3