From d7f7d292d83e2a3cd41d8da66d5abe0951b331b0 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 7 Mar 2018 21:52:29 +0100 Subject: [PATCH] Cygwin: reorder read/write calls in fhandler_socket_unix Signed-off-by: Corinna Vinschen --- winsup/cygwin/fhandler.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 13f406821..7d45aa084 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -922,18 +922,19 @@ class fhandler_socket_unix : public fhandler_socket int shutdown (int how); int close (); int getpeereid (pid_t *pid, uid_t *euid, gid_t *egid); + ssize_t recvmsg (struct msghdr *msg, int flags); ssize_t recvfrom (void *ptr, size_t len, int flags, struct sockaddr *from, int *fromlen); - ssize_t recvmsg (struct msghdr *msg, int flags); void __reg3 read (void *ptr, size_t& len); - ssize_t __stdcall readv (const struct iovec *, int iovcnt, + ssize_t __stdcall readv (const struct iovec *const iov, int iovcnt, ssize_t tot = -1); + ssize_t sendmsg (const struct msghdr *msg, int flags); ssize_t sendto (const void *ptr, size_t len, int flags, const struct sockaddr *to, int tolen); - ssize_t sendmsg (const struct msghdr *msg, int flags); ssize_t __stdcall write (const void *ptr, size_t len); - ssize_t __stdcall writev (const struct iovec *, int iovcnt, ssize_t tot = -1); + ssize_t __stdcall writev (const struct iovec *const iov, int iovcnt, + ssize_t tot = -1); int setsockopt (int level, int optname, const void *optval, __socklen_t optlen); int getsockopt (int level, int optname, const void *optval,