Dmitry Timoshkov : ws2_32: Use a symbolic name instead of hand-made value.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 888c930f2d0fb6707ceee1a5571db5077274de79
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=888c930f2d0fb6707ceee1a5...

Author: Dmitry Timoshkov 
Date:   Mon Oct  2 00:15:59 2006 +0900

ws2_32: Use a symbolic name instead of hand-made value.

---

dlls/ws2_32/socket.c |    4 ++--
 include/winsock.h    |   10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 637642c..2cd230b 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2258,7 +2258,7 @@ #endif
        break;

default:
-       WARN("\tunsupported WS_IOCTL cmd (%08lx)\n", dwIoControlCode);
+       FIXME("unsupported WS_IOCTL cmd (%08lx)\n", dwIoControlCode);
        release_sock_fd( s, fd );
        WSASetLastError(WSAEOPNOTSUPP);
        return SOCKET_ERROR;
@@ -2318,7 +2318,7 @@ int WINAPI WS_ioctlsocket(SOCKET s, long
         newcmd=SIOCATMARK;
         break;

-    case WS__IOW('f',125,u_long):
+    case WS_FIOASYNC:
         WARN("Warning: WS1.1 shouldn't be using async I/O\n");
         SetLastError(WSAEINVAL);
         return SOCKET_ERROR;
diff --git a/include/winsock.h b/include/winsock.h
index 32827ed..e95ab2f 100644
--- a/include/winsock.h
+++ b/include/winsock.h
@@ -750,10 +750,20 @@ #endif
 #ifndef USE_WS_PREFIX
 #define FIONREAD                   _IOR('f', 127, u_long)
 #define FIONBIO                    _IOW('f', 126, u_long)
+#define FIOASYNC                   _IOW('f', 125, u_long)
+#define SIOCSHIWAT                 _IOW('s',  0, u_long)
+#define SIOCGHIWAT                 _IOR('s',  1, u_long)
+#define SIOCSLOWAT                 _IOW('s',  2, u_long)
+#define SIOCGLOWAT                 _IOR('s',  3, u_long)
 #define SIOCATMARK                 _IOR('s',  7, u_long)
 #else
 #define WS_FIONREAD                WS__IOR('f', 127, u_long)
 #define WS_FIONBIO                 WS__IOW('f', 126, u_long)
+#define WS_FIOASYNC                WS__IOW('f', 125, u_long)
+#define WS_SIOCSHIWAT              WS__IOW('s',  0, u_long)
+#define WS_SIOCGHIWAT              WS__IOR('s',  1, u_long)
+#define WS_SIOCSLOWAT              WS__IOW('s',  2, u_long)
+#define WS_SIOCGLOWAT              WS__IOR('s',  3, u_long)
 #define WS_SIOCATMARK              WS__IOR('s',  7, u_long)
 #endif