about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-11-02 22:12:09 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-11-02 22:12:09 +0000
commit6c073ad6fe96c9e1f4ad4e2013411e71434ae0a8 (patch)
treed76b60b95e32402c29a7a22a8d710ee7ac7e13b7
parent0155d5b26e32b2012d9f1842c3b06324746d3087 (diff)
downloadglibc-6c073ad6fe96c9e1f4ad4e2013411e71434ae0a8.tar.gz
glibc-6c073ad6fe96c9e1f4ad4e2013411e71434ae0a8.tar.xz
glibc-6c073ad6fe96c9e1f4ad4e2013411e71434ae0a8.zip
conformtest: Fix sys/wait.h expectations for struct rusage.
-rw-r--r--ChangeLog3
-rw-r--r--conform/data/sys/wait.h-data2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c84a492cf0..13bb8c6e66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-11-02  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/data/sys/wait.h-data [XPG3 || XOPEN2K8 || POSIX2008]
+	(struct rusage): Do not expect type or its members.
+
 	[BZ #3439]
 	* math/math.h (FP_NAN): Define macro to integer constant usable in
 	#if and use that to give value to enum constant.
diff --git a/conform/data/sys/wait.h-data b/conform/data/sys/wait.h-data
index 818766921d..6acdab296b 100644
--- a/conform/data/sys/wait.h-data
+++ b/conform/data/sys/wait.h-data
@@ -47,7 +47,7 @@ element siginfo_t int si_status
 element siginfo_t long si_band
 element siginfo_t {union sigval} si_value
 
-#if !defined POSIX
+#if !defined POSIX && !defined XPG3 && !defined XOPEN2K8 && !defined POSIX2008
 type {struct rusage}
 
 element {struct rusage} {struct timeval} ru_utime