Re: PATCH: fix dlls/winsock/socket.c

[Kirill Smelkov <kirr@xxxxxxxxxxxxxxxxxxx>]

On Thursday 11 December 2003 11:28, Gerald Pfeifer wrote:
> The following patch broke all FreeBSD platforms (and probably others)...
>
>   revision 1.142
>   date: 2003/12/11 05:16:48;  author: julliard;  state: Exp;  lines: +35 -0
>   Kirill Smelkov <kirr@xxxxxxxxxxxxxxxxxxx>
>   Added stub and prototype for WSAJoinLeaf.
>
> ...and, frankly, having both u_long and ulong on a single line looks
> suspicious by itself.

Umm... yes, I'm sorry...
>
> ChangeLog:
> Fix types in WSAHtonl.
> Index: socket.c
the correct fix is then as follows:
Index: socket.c
===================================================================
RCS file: /home/wine/wine/dlls/winsock/socket.c,v
retrieving revision 1.142
diff -u -r1.142 socket.c
--- socket.c    11 Dec 2003 05:16:48 -0000      1.142
+++ socket.c    11 Dec 2003 17:36:05 -0000
@@ -1585,7 +1585,7 @@
 /***********************************************************************
  *             WSAHtonl                (WS2_32.46)
  */
-int WINAPI WSAHtonl(SOCKET s, u_long hostlong, ulong *lpnetlong)
+int WINAPI WSAHtonl(SOCKET s, u_long hostlong, u_long *lpnetlong)
 {
     FIXME("stub.\n");
     return INVALID_SOCKET;
@@ -1594,7 +1594,7 @@
 /***********************************************************************
  *             WSAHtons                (WS2_32.47)
  */
-int WINAPI WSAHtons(SOCKET s, u_short hostshort, ushort *lpnetshort)
+int WINAPI WSAHtons(SOCKET s, u_short hostshort, u_short *lpnetshort)
 {
     FIXME("stub.\n");
     return INVALID_SOCKET;