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.
---
 sysdeps/generic/bits/condition-attr.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sysdeps/generic/bits/condition-attr.h')

diff --git a/sysdeps/generic/bits/condition-attr.h b/sysdeps/generic/bits/condition-attr.h
index a131128..4cd4e8c 100644
--- a/sysdeps/generic/bits/condition-attr.h
+++ b/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 */
-- 
cgit v1.2.3