diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2018-03-09 16:17:39 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2018-03-09 16:17:39 +0300 |
| commit | f4a1a186f9f3550b930738d0472bff97728f39e6 (patch) | |
| tree | 1a6aa2571e410131ae1a08d0e16ac0c36b89a3ce | |
| parent | e4c65b2e918107287845ab345bc0607bde0323f7 (diff) | |
Cygwin: fix socketpair prototype
Last parameter is a vector of 2 ints, not a pointer to int
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/include/sys/socket.h | 2 | ||||
| -rw-r--r-- | winsup/cygwin/net.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/winsup/cygwin/include/sys/socket.h b/winsup/cygwin/include/sys/socket.h index e6b92eef8..4b61cb0ef 100644 --- a/winsup/cygwin/include/sys/socket.h +++ b/winsup/cygwin/include/sys/socket.h @@ -40,7 +40,7 @@ extern "C" int shutdown (int, int); int socket (int __family, int __type, int __protocol); int sockatmark (int __fd); - int socketpair (int __domain, int __type, int __protocol, int *__socket_vec); + int socketpair (int __domain, int __type, int __protocol, int __fds[2]); struct servent *getservbyname (const char *__name, const char *__proto); #endif diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 38a53f815..67cd96755 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -2271,7 +2271,7 @@ cygwin_bindresvport (int fd, struct sockaddr_in *sin) /* socketpair: POSIX.1-2001, POSIX.1-2008, 4.4BSD. */ extern "C" int -socketpair (int af, int type, int protocol, int *sb) +socketpair (int af, int type, int protocol, int sv[2]) { int res = -1; const device *dev; @@ -2324,8 +2324,8 @@ socketpair (int af, int type, int protocol, int *sb) set_std_handle (fd_out); __try { - sb[0] = fd_in; - sb[1] = fd_out; + sv[0] = fd_in; + sv[1] = fd_out; res = 0; } __except (EFAULT) {} |