diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2018-02-16 16:41:42 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2018-02-16 16:41:42 +0100 |
| commit | 2327f01726d48dd20b410c499924fe9f69b6ef75 (patch) | |
| tree | 99d2e120359fe2c427595f24c0cf786aa2847f46 | |
| parent | 4e04751fc76611c68460395b491990678f54e313 (diff) | |
| download | cygnal-2327f01726d48dd20b410c499924fe9f69b6ef75.tar.gz cygnal-2327f01726d48dd20b410c499924fe9f69b6ef75.tar.bz2 cygnal-2327f01726d48dd20b410c499924fe9f69b6ef75.zip | |
Cygwin: fhandler_socket: Add :: to potentially colliding WinSock calls
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/fhandler_socket.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 3a18ff593..a7c702e7e 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -957,8 +957,8 @@ fhandler_socket::evaluate_events (const long event_mask, long &events, CV 2014-06-16: Call WSASetLastError *after* setsockopt since, apparently, setsockopt sets the last WSA error code to 0 on success. */ - setsockopt (get_socket (), SOL_SOCKET, SO_ERROR, - (const char *) &wsa_err, sizeof wsa_err); + ::setsockopt (get_socket (), SOL_SOCKET, SO_ERROR, + (const char *) &wsa_err, sizeof wsa_err); WSASetLastError (wsa_err); ret = SOCKET_ERROR; } @@ -1654,7 +1654,7 @@ fhandler_socket::accept4 (struct sockaddr *peer, int *len, int flags) } else { - closesocket (res); + ::closesocket (res); res = -1; } } @@ -2331,7 +2331,7 @@ fhandler_socket::close () int res = 0; release_events (); - while ((res = closesocket (get_socket ())) != 0) + while ((res = ::closesocket (get_socket ())) != 0) { if (WSAGetLastError () != WSAEWOULDBLOCK) { @@ -2557,7 +2557,7 @@ fhandler_socket::ioctl (unsigned int cmd, void *p) case _IOR('f', 127, u_long): #endif /* Make sure to use the Winsock definition of FIONREAD. */ - res = ioctlsocket (get_socket (), _IOR('f', 127, u_long), (u_long *) p); + res = ::ioctlsocket (get_socket (), _IOR('f', 127, u_long), (u_long *) p); if (res == SOCKET_ERROR) set_winsock_errno (); break; @@ -2577,7 +2577,7 @@ fhandler_socket::ioctl (unsigned int cmd, void *p) res = 0; } else - res = ioctlsocket (get_socket (), cmd, (u_long *) p); + res = ::ioctlsocket (get_socket (), cmd, (u_long *) p); break; } syscall_printf ("%d = ioctl_socket(%x, %p)", res, cmd, p); |