From 701ab7dd61982b1189ace7aab4778ef8786a3d99 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Thu, 23 Jan 2003 21:20:36 +0000 Subject: [PATCH] Improve portability wrt. struct sockaddr_ipx. --- dlls/winsock/socket.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index 7ef71467190..9ec301fced0 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -120,6 +120,10 @@ #include "wine/server.h" #include "wine/debug.h" +#ifdef __FreeBSD__ +# define sipx_network sipx_addr.x_net +# define sipx_node sipx_addr.x_host +#endif /* __FreeBSD__ */ WINE_DEFAULT_DEBUG_CHANNEL(winsock); @@ -878,8 +882,10 @@ static const struct sockaddr* ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, * in one go */ memcpy(&uipx->sipx_network,wsipx->sa_netnum,sizeof(uipx->sipx_network)+sizeof(uipx->sipx_node)); +#ifdef IPX_FRAME_NONE uipx->sipx_type=IPX_FRAME_NONE; - uipx->sipx_zero=0; +#endif + memset(&uipx->sipx_zero,0,sizeof uipx->sipx_zero); return (const struct sockaddr*)uipx; } #endif