From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 9 Mar 2012 21:10:45 +0000 (+0000)
Subject: Make pthread.h define all symbols from time.h.
X-Git-Tag: glibc-2.16-tps~845
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90ad551f732ab70f0f1fca3d12d60c3d2d0e118c;p=thirdparty%2Fglibc.git

Make pthread.h define all symbols from time.h.

See:
http://www.pasc.org/interps/unofficial/db/p1003.1c/pasc-1003.1c-46.html
http://www.pasc.org/interps/unofficial/db/p1003.1/pasc-1003.1-86.html
https://www.opengroup.org/sophocles/show_mail.tpl?CALLER=index.tpl&source=L&listname=austin-group-l&id=17302
(Geoff Clare, austin-group-l, 9 Mar 2012)
---

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 6d5f847261f..3f70b0a2951 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-09  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/pthread/pthread.h (__need_clockid_t, __need_timespec):
+	Do not define before including <time.h>.
+
 2012-03-08  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/unix/sysv/linux/sparc/sem_post.c: Update copyright year.
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 0d33cbdb9e9..bd97e8556f6 100644
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -21,10 +21,6 @@
 #include <features.h>
 #include <endian.h>
 #include <sched.h>
-#ifdef __USE_XOPEN2K
-# define __need_clockid_t
-#endif
-#define __need_timespec
 #include <time.h>
 
 #include <bits/pthreadtypes.h>