Hi,
License: X11
ChangeLog:
Jon Griffiths <jon_p_griffiths@yahoo.com>
+include/winsock.h
msvc fixes
=====
"Don't wait for the seas to part, or messiahs to come;
Don't you sit around and waste this chance..." - Live
jon_p_griffiths@yahoo.com
__________________________________
Do you Yahoo!?
SBC Yahoo! DSL - Now only $29.95 per month!
http://sbc.yahoo.com
--- wine/include/winsock.h Fri Jul 4 17:48:27 2003
+++ wine-develop/include/winsock.h Sat Jul 12 18:08:53 2003
@@ -96,7 +96,7 @@
#ifndef _WINSOCKAPI_
#define _WINSOCKAPI_
-#if defined(__MINGW_H) && !defined(MSVCRT_BSD_TYPES_DEFINED)
+#if defined(_MSC_VER) || (defined(__MINGW_H) && !defined(MSVCRT_BSD_TYPES_DEFINED))
/* MinGW doesn't define the u_xxx types */
typedef unsigned char u_char;
typedef unsigned short u_short;
@@ -497,7 +497,7 @@
}
inline static u_long __wine_ulong_swap(u_long l)
{
- return ((u_long)__wine_ushort_swap(l) << 16) | __wine_ushort_swap(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)
