Fix the SOCKADDR_IPX declaration.

Centralize all sockaddr_xxx conversions in ws_sockaddr_ws2u and ws_sockaddr_u2ws. Remove ugly casts in TRACEs.

Fix the SOCKADDR_IPX declaration.
76f6ffaf · Francois Gouget · Alexandre Julliard · b85a6e8c · 76f6ffaf · 76f6ffaf
Commit 76f6ffaf authored Oct 08, 2001 by Francois Gouget Committed by Alexandre Julliard Oct 08, 2001
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 14 deletions

socket.c dlls/winsock/socket.c +0 -0

winsock.h include/winsock.h +0 -11

wsipx.h include/wsipx.h +11 -3

No files found.
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
--- a/include/winsock.h
+++ b/include/winsock.h
@@ -441,17 +441,6 @@ INT     WINAPI   WSARecvEx(SOCKET s, char *buf, INT len, INT *flags);

 #define WS_AF_MAX          27

-#include "pshpack1.h"
-
-struct ws_sockaddr_ipx
-{
-	SHORT		sipx_family;
-	UINT		sipx_network;
-	CHAR		sipx_node[6];
-	WORD		sipx_port;
-};
-
-#include "poppack.h"

 #ifdef __cplusplus
 }

--- a/include/wsipx.h
+++ b/include/wsipx.h
 /* WCIPX.H
 */

-#ifndef _WINE_WCIPX_
-#define _WINE_WCIPX_
+#ifndef _WINE_WSIPX_
+#define _WINE_WSIPX_

 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */

+typedef struct ws_sockaddr_ipx
+{
+    short sa_family;
+    char sa_netnum[4];
+    char sa_nodenum[6];
+    unsigned short sa_socket;
+} SOCKADDR_IPX, *PSOCKADDR_IPX, *LPSOCKADDR_IPX;
+
 /*
 * constants
 */
@@ -20,4 +28,4 @@ extern "C" {
 }      /* extern "C" */
 #endif /* defined(__cplusplus) */

-#endif /* _WINE_WCIPX_ */
+#endif /* _WINE_WSIPX_ */