This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH/committed] ia64: msg.h: fix msg_qnum/msg_qbytes types
- From: Mike Frysinger <vapier at gentoo dot org>
- To: libc-alpha at sourceware dot org
- Date: Tue, 21 Jul 2015 22:47:23 -0400
- Subject: [PATCH/committed] ia64: msg.h: fix msg_qnum/msg_qbytes types
- Authentication-results: sourceware.org; auth=none
These two fields have dedicated types, so change the ia64 header to match
all the other arches. This fixes the conform test for msg.h.
---
ChangeLog | 9 +++++++++
sysdeps/unix/sysv/linux/ia64/bits/msq.h | 13 +++++++++----
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 991cb88..652d968 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2015-07-22 Mike Frysinger <vapier@gentoo.org>
+ * sysdeps/unix/sysv/linux/ia64/bits/msq.h: Change sys/types.h include
+ to bits/types.h.
+ (msgqnum_t): New typedef.
+ (msglen_t): Likewise.
+ (struct msqid_ds): Update comment. Change msg_qnum type to msgqnum_t
+ and msg_qbytes type to msglen_t.
+
+2015-07-22 Mike Frysinger <vapier@gentoo.org>
+
* sysdeps/unix/sysv/linux/ia64/bits/stat.h (struct stat): Rename
pad0 to __glibc_reserved0.
(struct stat64): Likewise.
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/msq.h b/sysdeps/unix/sysv/linux/ia64/bits/msq.h
index 8c043b4..e7a3cf2 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/msq.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/msq.h
@@ -20,7 +20,7 @@
#error "Never use <bits/msq.h> directly; include <sys/msg.h> instead."
#endif
-#include <sys/types.h>
+#include <bits/types.h>
/* Define options for message queue functions. */
#define MSG_NOERROR 010000 /* no error if message is too big */
@@ -29,8 +29,13 @@
# define MSG_COPY 040000 /* copy (not remove) all queue messages */
#endif
+/* Types used in the structure definition. */
+typedef unsigned long int msgqnum_t;
+typedef unsigned long int msglen_t;
+
+
/* Structure of record for one message inside the kernel.
- The type `struct __msg' is opaque. */
+ The type `struct msg' is opaque. */
struct msqid_ds
{
struct ipc_perm msg_perm; /* structure describing operation permission */
@@ -38,8 +43,8 @@ struct msqid_ds
__time_t msg_rtime; /* time of last msgrcv command */
__time_t msg_ctime; /* time of last change */
unsigned long int __msg_cbytes; /* current number of bytes on queue */
- unsigned long int msg_qnum; /* number of messages currently on queue */
- unsigned long int msg_qbytes; /* max number of bytes allowed on queue */
+ msgqnum_t msg_qnum; /* number of messages currently on queue */
+ msglen_t msg_qbytes; /* max number of bytes allowed on queue */
__pid_t msg_lspid; /* pid of last msgsnd() */
__pid_t msg_lrpid; /* pid of last msgrcv() */
unsigned long int __glibc_reserved1;
--
2.4.4