From a8f4390dd1ba9859096d5a9443beac1a60800f01 Mon Sep 17 00:00:00 2001
From: GOUJON Alexandre <ale.goujon@gmail.com>
Date: Tue, 9 Jul 2013 12:39:57 +0200
Subject: [PATCH] port.h: Make READ_DWORD a real function instead of a macro

---
 macosx/mac-global_prefix.h |  1 -
 port.h                     | 21 +++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/macosx/mac-global_prefix.h b/macosx/mac-global_prefix.h
index 4d6102d3..32bd623d 100644
--- a/macosx/mac-global_prefix.h
+++ b/macosx/mac-global_prefix.h
@@ -189,7 +189,6 @@
  ***********************************************************************************/
 
 
-#undef	READ_DWORD(s)
 #undef	WRITE_DWORD(s, d)
 
 #define ZLIB
diff --git a/port.h b/port.h
index 33e64483..0272693d 100644
--- a/port.h
+++ b/port.h
@@ -423,11 +423,28 @@ static inline void WRITE_3WORD(uint8 *out, uint32 in)
 #endif
 }
 
+static inline uint32 READ_DWORD(uint8 *in)
+{
+    union DWORD out;
+
+#if defined(LSB_FIRST)
+    out.u8[0] = in[0];
+    out.u8[1] = in[1];
+    out.u8[2] = in[2];
+    out.u8[3] = in[3];
+#else
+    out.u8[0] = in[3];
+    out.u8[1] = in[2];
+    out.u8[2] = in[1];
+    out.u8[3] = in[0];
+#endif
+
+    return (out.u32);
+}
+
 #ifdef FAST_LSB_WORD_ACCESS
-#define READ_DWORD(s)		(*(uint32 *) (s))
 #define WRITE_DWORD(s, d)	*(uint32 *) (s) = (d)
 #else
-#define READ_DWORD(s)		(*(uint8 *) (s) | (*((uint8 *) (s) + 1) << 8) | (*((uint8 *) (s) + 2) << 16) | (*((uint8 *) (s) + 3) << 24))
 #define WRITE_DWORD(s, d)	*(uint8 *) (s) = (uint8) (d), *((uint8 *) (s) + 1) = (uint8) ((d) >> 8), *((uint8 *) (s) + 2) = (uint8) ((d) >> 16), *((uint8 *) (s) + 3) = (uint8) ((d) >> 24)
 #endif