From 29600e04e3408a83e4989d9ebce7f80ff3aaea61 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 1 Jul 2016 16:56:07 +0200 Subject: Make sure to use the Winsock definition of FIONREAD in ioctlsocket call Commit b1b46d45 introduced a regression. After redefining FIONREAD as part of restructuring newlib/Cygwin headers, the call to ioctlsocket in the FIONREAD branch of fhandler_socket::ioctl should have been changed to use the Winsock definition of FIONREAD, which I neglected. This only affects 64 bit Cygwin. Signed-off-by: Corinna Vinschen --- winsup/cygwin/fhandler_socket.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 71a7bdc53..9ada4697d 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -2259,7 +2259,8 @@ fhandler_socket::ioctl (unsigned int cmd, void *p) #ifdef __x86_64__ case _IOR('f', 127, u_long): #endif - res = ioctlsocket (get_socket (), FIONREAD, (u_long *) p); + /* Make sure to use the Winsock definition of FIONREAD. */ + res = ioctlsocket (get_socket (), _IOR('f', 127, u_long), (u_long *) p); if (res == SOCKET_ERROR) set_winsock_errno (); break; -- cgit v1.2.3