This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.21-632-g9c9184b
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 Jul 2015 02:47:29 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-632-g9c9184b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 9c9184b4491461e39008e7d18d5c472570cd0755 (commit)
from 43ef68758126e7835ba40ce1cf09bc62f2d9ad51 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9c9184b4491461e39008e7d18d5c472570cd0755
commit 9c9184b4491461e39008e7d18d5c472570cd0755
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue Jul 21 22:44:48 2015 -0400
ia64: msg.h: fix msg_qnum/msg_qbytes types
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.
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;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
sysdeps/unix/sysv/linux/ia64/bits/msq.h | 13 +++++++++----
2 files changed, 18 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources