winsock: Get rid of already disabled WS prefix, thus fix Wine compilation on big-endian.

This commit is contained in:
Pierre d'Herbemont 2006-11-27 18:19:03 +01:00 committed by Alexandre Julliard
parent 167b32cc4b
commit 4919a76edf
1 changed files with 7 additions and 7 deletions

View File

@ -516,20 +516,20 @@ int WINAPI __WSAFDIsSet(SOCKET,WS(fd_set)*);
#ifdef WORDS_BIGENDIAN
#define htonl(l) ((WS(u_long))(l))
#define htons(s) ((WS(u_short))(s))
#define ntohl(l) ((WS(u_long))(l))
#define ntohs(s) ((WS(u_short))(s))
#define htonl(l) ((u_long)(l))
#define htons(s) ((u_short)(s))
#define ntohl(l) ((u_long)(l))
#define ntohs(s) ((u_short)(s))
#else /* WORDS_BIGENDIAN */
inline static WS(u_short) __wine_ushort_swap(WS(u_short) s)
inline static u_short __wine_ushort_swap(u_short s)
{
return (s >> 8) | (s << 8);
}
inline static WS(u_long) __wine_ulong_swap(WS(u_long) l)
inline static u_long __wine_ulong_swap(u_long l)
{
return ((WS(u_long))__wine_ushort_swap((WS(u_short))l) << 16) | __wine_ushort_swap((WS(u_short))(l >> 16));
return ((u_long)__wine_ushort_swap((u_short)l) << 16) | __wine_ushort_swap((u_short)(l >> 16));
}
#define htonl(l) __wine_ulong_swap(l)
#define htons(s) __wine_ushort_swap(s)