summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.vnet.ibm.com>2015-07-07 16:11:14 +0200
committerAndreas Krebbel <krebbel@linux.vnet.ibm.com>2015-07-07 16:11:14 +0200
commit3fdc131c26fe7663360785d49d2c427b097742bb (patch)
treecf154fdb8793dd7b6f554071eb7c8bd410603e22
parent9aec6d2a2f2388b08db6af7c2369d8e694d82c9a (diff)
downloadglibc-3fdc131c26fe7663360785d49d2c427b097742bb.tar.gz
S390: Fix sem.h conformance test failures.
On s390 the following tests are failing due to unkown types time_t, pid_t: FAIL: conform/UNIX98/sys/sem.h/conform FAIL: conform/XOPEN2K/sys/sem.h/conform FAIL: conform/XOPEN2K8/sys/sem.h/conform FAIL: conform/XPG3/sys/sem.h/conform FAIL: conform/XPG4/sys/sem.h/conform This patch changes the s390 specific sem.h and includes sys/types.h instead of bits/types.h. All other archs include sys/types.h, too. Including bits/wordsize.h is obselete, because it is already inlcuded in sys/types.h -> bits/types.h. ChangeLog: * sysdeps/unix/sysv/linux/s390/bits/sem.h: Include sys/types.h instead of bits/types.h. Remove inclusion of bits/wordsize.h.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/s390/bits/sem.h3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e00fd0d533..c8d85615f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-07 Stefan Liebler <stli@linux.vnet.ibm.com>
+
+ * sysdeps/unix/sysv/linux/s390/bits/sem.h:
+ Include sys/types.h instead of bits/types.h.
+ Remove inclusion of bits/wordsize.h.
+
2015-07-07 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86_64/tst-auditmod10b.c (la_symbind32): New.
diff --git a/sysdeps/unix/sysv/linux/s390/bits/sem.h b/sysdeps/unix/sysv/linux/s390/bits/sem.h
index 9f8cd4715b..2e12effdd2 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/sem.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/sem.h
@@ -19,8 +19,7 @@
# error "Never include <bits/sem.h> directly; use <sys/sem.h> instead."
#endif
-#include <bits/types.h>
-#include <bits/wordsize.h>
+#include <sys/types.h>
/* Flags for `semop'. */
#define SEM_UNDO 0x1000 /* undo the operation on exit */