This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
Community source repository for glibc add-on ports branch, master, updated. glibc-2.14-15-g560d4a5
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 13 Sep 2011 16:04:19 -0000
- Subject: Community source repository for glibc add-on ports branch, master, updated. glibc-2.14-15-g560d4a5
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 "Community source repository for glibc add-on ports".
The branch, master has been updated
via 560d4a5882df782e1ede396870ec18e382842bae (commit)
from 329c2e635813fac3a18bbe052474c1b1eea7526e (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://sources.redhat.com/git/gitweb.cgi?p=glibc-ports.git;a=commitdiff;h=560d4a5882df782e1ede396870ec18e382842bae
commit 560d4a5882df782e1ede396870ec18e382842bae
Author: Joseph Myers <joseph@codesourcery.com>
Date: Tue Sep 13 16:04:03 2011 +0000
Cast __cmsg_nxthdr return value for MIPS.
diff --git a/ChangeLog.mips b/ChangeLog.mips
index b99b338..8da2af2 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,5 +1,10 @@
2011-09-13 Joseph Myers <joseph@codesourcery.com>
+ * sysdeps/unix/sysv/linux/mips/bits/socket.h (__cmsg_nxthdr): Cast
+ return value to (struct cmsghdr *).
+
+2011-09-13 Joseph Myers <joseph@codesourcery.com>
+
* sysdeps/mips/elf/configure.in: Always test for TLS support and
error out in case it is missing.
* sysdeps/mips/elf/configure: Regenerate.
diff --git a/sysdeps/unix/sysv/linux/mips/bits/socket.h b/sysdeps/unix/sysv/linux/mips/bits/socket.h
index 2399490..4aacfae 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/socket.h
@@ -312,7 +312,7 @@ __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
{
if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
/* The kernel header does this so there may be a reason. */
- return 0;
+ return (struct cmsghdr *) 0;
__cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg
+ CMSG_ALIGN (__cmsg->cmsg_len));
@@ -321,7 +321,7 @@ __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
|| ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len)
> ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen)))
/* No more entries. */
- return 0;
+ return (struct cmsghdr *) 0;
return __cmsg;
}
#endif /* Use `extern inline'. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog.mips | 5 +++++
sysdeps/unix/sysv/linux/mips/bits/socket.h | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
Community source repository for glibc add-on ports