diff options
| author | Ondřej Bílka <neleai@seznam.cz> | 2014-09-20 13:52:57 +0200 |
|---|---|---|
| committer | Ondřej Bílka <neleai@seznam.cz> | 2014-09-20 13:53:44 +0200 |
| commit | 20e5a5f773ee800b2d7ff3e24156a8b024f6bf46 (patch) | |
| tree | cef168fc79d38d68c14c971d59c633ffbbf4f95d | |
| parent | d3c827e7c8208afeaed880cf8cf2515c86d10f17 (diff) | |
| download | glibc-20e5a5f773ee800b2d7ff3e24156a8b024f6bf46.tar.gz glibc-20e5a5f773ee800b2d7ff3e24156a8b024f6bf46.tar.xz glibc-20e5a5f773ee800b2d7ff3e24156a8b024f6bf46.zip | |
Sync recvmmsg prototype with kernel usage.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | socket/recvmmsg.c | 2 | ||||
| -rw-r--r-- | socket/sys/socket.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/recvmmsg.c | 6 |
4 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 778b3e52d2..1b5a2b0a47 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 ed0c369486..3daa50126b 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 95ee26ab11..091b08c7c9 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 57ddf3152a..6c9ca4460d 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)) { |