Alexandre Julliard : dpwsockx: Use standard Win32 types instead of the BSD ones.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 854c3a872fa109df098b0926f347f7c945143938
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=854c3a872fa109df098b0926f3...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Sat Apr  3 18:08:24 2010 +0200

dpwsockx: Use standard Win32 types instead of the BSD ones.

---

 dlls/dpwsockx/dpwsockx_dll.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/dpwsockx/dpwsockx_dll.h b/dlls/dpwsockx/dpwsockx_dll.h
index a9454da..1a6ad6c 100644
--- a/dlls/dpwsockx/dpwsockx_dll.h
+++ b/dlls/dpwsockx/dpwsockx_dll.h
@@ -47,13 +47,13 @@ typedef struct tagDPWS_DATA
 
 #ifdef WORDS_BIGENDIAN
 
-static inline u_short __dpws_ushort_swap(u_short s)
+static inline USHORT __dpws_ushort_swap(USHORT s)
 {
     return (s >> 8) | (s << 8);
 }
-static inline u_long __dpws_ulong_swap(u_long l)
+static inline ULONG __dpws_ulong_swap(ULONG l)
 {
-    return ((u_long)__dpws_ushort_swap((u_short)l) << 16) | __dpws_ushort_swap((u_short)(l >> 16));
+    return ((ULONG)__dpws_ushort_swap((USHORT)l) << 16) | __dpws_ushort_swap((USHORT)(l >> 16));
 }
 
 #define dpws_letohl(l) __dpws_ulong_swap(l)
@@ -63,10 +63,10 @@ static inline u_long __dpws_ulong_swap(u_long l)
 
 #else /* WORDS_BIGENDIAN */
 
-#define dpws_letohl(l) ((u_long)(l))
-#define dpws_letohs(s) ((u_short)(s))
-#define dpws_htolel(l) ((u_long)(l))
-#define dpws_htoles(s) ((u_short)(s))
+#define dpws_letohl(l) ((ULONG)(l))
+#define dpws_letohs(s) ((USHORT)(s))
+#define dpws_htolel(l) ((ULONG)(l))
+#define dpws_htoles(s) ((USHORT)(s))
 
 #endif /* WORDS_BIGENDIAN */