summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2012-11-03 19:40:17 +0100
committerThomas Schwinge <thomas@codesourcery.com>2012-11-03 19:40:17 +0100
commit7964dfe9b4c1d47de02ec9c4373ff107aedcdf53 (patch)
tree9c3330792b8b75a3e652d71bd2513f2645f3a1b4 /include
parent7614cb15aa3b538a5c969de3e2230165bc11566b (diff)
parent24ffa4513c7e501dcca1a41f5da0b6fa21015b14 (diff)
Merge branch 't/sendmmsg' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts: ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist
Diffstat (limited to 'include')
-rw-r--r--include/sys/socket.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/sys/socket.h b/include/sys/socket.h
index 821a9c008a..9caf1bbdf5 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -102,11 +102,6 @@ extern ssize_t __libc_recvmsg (int __fd, struct msghdr *__message,
extern ssize_t __recvmsg (int __fd, struct msghdr *__message,
int __flags) attribute_hidden;
-extern int __recvmmsg (int __fd, struct mmsghdr *__vmessages,
- unsigned int __vlen, int __flags,
- const struct timespec *__tmo);
-libc_hidden_proto (__recvmmsg)
-
/* Set socket FD's option OPTNAME at protocol level LEVEL
to *OPTVAL (which is OPTLEN bytes long).
Returns 0 on success, -1 for errors. */