GNU C Library master sources branch master updated. glibc-2.20-41-g20e5a5f

[neleai at sourceware dot org]

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  20e5a5f773ee800b2d7ff3e24156a8b024f6bf46 (commit)
      from  d3c827e7c8208afeaed880cf8cf2515c86d10f17 (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=20e5a5f773ee800b2d7ff3e24156a8b024f6bf46

commit 20e5a5f773ee800b2d7ff3e24156a8b024f6bf46
Author: OndÅ?ej Bílka <neleai@seznam.cz>
Date:   Sat Sep 20 13:52:57 2014 +0200

    Sync recvmmsg prototype with kernel usage.

diff --git a/ChangeLog b/ChangeLog
index 778b3e5..1b5a2b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-20  OndÅ?ej Bílka  <neleai@seznam.cz>
+
+	* socket/recvmmsg.c (recvmmsg): Drop const argument.
+	* socket/sys/socket.h: Likewise
+	* sysdeps/unix/sysv/linux/recvmmsg.c: Likewise.
+
 2014-09-19  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
 	* stdlib/longlong.h: Add __udiv_w_sdiv prototype.
diff --git a/socket/recvmmsg.c b/socket/recvmmsg.c
index ed0c369..3daa501 100644
--- a/socket/recvmmsg.c
+++ b/socket/recvmmsg.c
@@ -23,7 +23,7 @@
    Returns the number of bytes read or -1 for errors.  */
 int
 recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags,
-	  const struct timespec *tmo)
+	  struct timespec *tmo)
 {
   __set_errno (ENOSYS);
   return -1;
diff --git a/socket/sys/socket.h b/socket/sys/socket.h
index 95ee26a..091b08c 100644
--- a/socket/sys/socket.h
+++ b/socket/sys/socket.h
@@ -209,7 +209,7 @@ extern ssize_t recvmsg (int __fd, struct msghdr *__message, int __flags);
    __THROW.  */
 extern int recvmmsg (int __fd, struct mmsghdr *__vmessages,
 		     unsigned int __vlen, int __flags,
-		     const struct timespec *__tmo);
+		     struct timespec *__tmo);
 #endif
 
 
diff --git a/sysdeps/unix/sysv/linux/recvmmsg.c b/sysdeps/unix/sysv/linux/recvmmsg.c
index 57ddf31..6c9ca44 100644
--- a/sysdeps/unix/sysv/linux/recvmmsg.c
+++ b/sysdeps/unix/sysv/linux/recvmmsg.c
@@ -35,7 +35,7 @@
 #ifdef __NR_recvmmsg
 int
 recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags,
-	  const struct timespec *tmo)
+	  struct timespec *tmo)
 {
   if (SINGLE_THREAD_P)
     return INLINE_SYSCALL (recvmmsg, 5, fd, vmessages, vlen, flags, tmo);
@@ -52,14 +52,14 @@ recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags,
 # ifndef __ASSUME_RECVMMSG_SOCKETCALL
 extern int __internal_recvmmsg (int fd, struct mmsghdr *vmessages,
 				unsigned int vlen, int flags,
-				const struct timespec *tmo)
+				struct timespec *tmo)
      attribute_hidden;
 
 static int have_recvmmsg;
 
 int
 recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags,
-	  const struct timespec *tmo)
+	  struct timespec *tmo)
 {
   if (__glibc_likely (have_recvmmsg >= 0))
     {

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                          |    6 ++++++
 socket/recvmmsg.c                  |    2 +-
 socket/sys/socket.h                |    2 +-
 sysdeps/unix/sysv/linux/recvmmsg.c |    6 +++---
 4 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources