Module: wine Branch: master Commit: 4919a76edf0ae9703607b12e71d1dc26d4ba67b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4919a76edf0ae9703607b12e71...
Author: Pierre d'Herbemont pdherbemont@free.fr Date: Mon Nov 27 18:19:03 2006 +0100
winsock: Get rid of already disabled WS prefix, thus fix Wine compilation on big-endian.
---
include/winsock.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/winsock.h b/include/winsock.h index ae5df6d..9d5165b 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -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)