libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-07 23:10:31 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: fhandler_socket: Add :: to potentially colliding WinSock calls

Browse Source 
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2018-02-16 16:41:42 +01:00
parent 4e04751fc7
commit 2327f01726
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/cygwin/fhandler_socket.cc
View File

@ -957,8 +957,8 @@ fhandler_socket::evaluate_events (const long event_mask, long &events,
CV 2014-06-16: Call WSASetLastError *after* setsockopt since, CV 2014-06-16: Call WSASetLastError *after* setsockopt since,
apparently, setsockopt sets the last WSA error code to 0 on apparently, setsockopt sets the last WSA error code to 0 on
success. */ success. */
setsockopt (get_socket (), SOL_SOCKET, SO_ERROR, ::setsockopt (get_socket (), SOL_SOCKET, SO_ERROR,
(const char *) &wsa_err, sizeof wsa_err); (const char *) &wsa_err, sizeof wsa_err);
WSASetLastError (wsa_err); WSASetLastError (wsa_err);
ret = SOCKET_ERROR; ret = SOCKET_ERROR;
} }
@ -1654,7 +1654,7 @@ fhandler_socket::accept4 (struct sockaddr *peer, int *len, int flags)
} }
else else
{ {
closesocket (res); ::closesocket (res);
res = -1; res = -1;
} }
} }
@ -2331,7 +2331,7 @@ fhandler_socket::close ()
int res = 0; int res = 0;
release_events (); release_events ();
while ((res = closesocket (get_socket ())) != 0) while ((res = ::closesocket (get_socket ())) != 0)
{ {
if (WSAGetLastError () != WSAEWOULDBLOCK) if (WSAGetLastError () != WSAEWOULDBLOCK)
{ {
@ -2557,7 +2557,7 @@ fhandler_socket::ioctl (unsigned int cmd, void *p)
case _IOR('f', 127, u_long): case _IOR('f', 127, u_long):
#endif #endif
/* Make sure to use the Winsock definition of FIONREAD. */ /* 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) if (res == SOCKET_ERROR)
set_winsock_errno (); set_winsock_errno ();
break; break;
@ -2577,7 +2577,7 @@ fhandler_socket::ioctl (unsigned int cmd, void *p)
res = 0; res = 0;
} }
else else
res = ioctlsocket (get_socket (), cmd, (u_long *) p); res = ::ioctlsocket (get_socket (), cmd, (u_long *) p);
break; break;
} }
syscall_printf ("%d = ioctl_socket(%x, %p)", res, cmd, p); syscall_printf ("%d = ioctl_socket(%x, %p)", res, cmd, p);