From: Anton Baskanov baskanov@gmail.com
--- dlls/dpwsockx/dpwsockx_dll.h | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-)
diff --git a/dlls/dpwsockx/dpwsockx_dll.h b/dlls/dpwsockx/dpwsockx_dll.h index ea3780ffe62..3f1f2b9c2b7 100644 --- a/dlls/dpwsockx/dpwsockx_dll.h +++ b/dlls/dpwsockx/dpwsockx_dll.h @@ -52,34 +52,6 @@ typedef struct tagDPWS_DATA LPDIRECTPLAYSP lpISP; } DPWS_DATA, *LPDPWS_DATA;
- - -#ifdef WORDS_BIGENDIAN - -static inline USHORT __dpws_ushort_swap(USHORT s) -{ - return (s >> 8) | (s << 8); -} -static inline ULONG __dpws_ulong_swap(ULONG l) -{ - return ((ULONG)__dpws_ushort_swap((USHORT)l) << 16) | __dpws_ushort_swap((USHORT)(l >> 16)); -} - -#define dpws_letohl(l) __dpws_ulong_swap(l) -#define dpws_letohs(s) __dpws_ushort_swap(s) -#define dpws_htolel(l) __dpws_ulong_swap(l) -#define dpws_htoles(s) __dpws_ushort_swap(s) - -#else /* WORDS_BIGENDIAN */ - -#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 */ - - #include "pshpack1.h"
typedef struct tagDPSP_MSG_HEADER @@ -96,9 +68,9 @@ typedef const DPSP_MSG_HEADER* LPCDPSP_MSG_HEADER; #define DPSP_MSG_TOKEN_FORWARDED 0xCAB00000 #define DPSP_MSG_TOKEN_SERVER 0xBAB00000
-#define DPSP_MSG_MAKE_MIXED(s,t) dpws_htolel((s) | (t)) -#define DPSP_MSG_SIZE(m) (dpws_letohl(m) & 0x000FFFFF) -#define DPSP_MSG_TOKEN(m) (dpws_letohl(m) & 0xFFF00000) +#define DPSP_MSG_MAKE_MIXED(s,t) ((s) | (t)) +#define DPSP_MSG_SIZE(m) ((m) & 0x000FFFFF) +#define DPSP_MSG_TOKEN(m) ((m) & 0xFFF00000)