Commit 701ab7dd authored by Gerald Pfeifer's avatar Gerald Pfeifer Committed by Alexandre Julliard

Improve portability wrt. struct sockaddr_ipx.

parent 66fd8c29
...@@ -120,6 +120,10 @@ ...@@ -120,6 +120,10 @@
#include "wine/server.h" #include "wine/server.h"
#include "wine/debug.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); WINE_DEFAULT_DEBUG_CHANNEL(winsock);
...@@ -878,8 +882,10 @@ static const struct sockaddr* ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, ...@@ -878,8 +882,10 @@ static const struct sockaddr* ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr,
* in one go * in one go
*/ */
memcpy(&uipx->sipx_network,wsipx->sa_netnum,sizeof(uipx->sipx_network)+sizeof(uipx->sipx_node)); 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_type=IPX_FRAME_NONE;
uipx->sipx_zero=0; #endif
memset(&uipx->sipx_zero,0,sizeof uipx->sipx_zero);
return (const struct sockaddr*)uipx; return (const struct sockaddr*)uipx;
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment