Fabian Maurer : ole32: Don't redefine htole32/htole16.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: ef2d127bbc67e3caa94e2bbb2465ca11ffb2f4d9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ef2d127bbc67e3caa94e2bbb2...

Author: Fabian Maurer 
Date:   Sat Oct  7 18:14:53 2017 +0200

ole32: Don't redefine htole32/htole16.

On some systems these macros are already defined
in usr/include/endian.h

Signed-off-by: Fabian Maurer 
Signed-off-by: Vincent Povirk 
Signed-off-by: Alexandre Julliard 
(cherry picked from commit 0736e4e302aded8791ce1e9a6c0fc805bcd55aff)
Signed-off-by: Michael Stefaniuc

---

dlls/ole32/storage32.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index 4fcfd9c..c628523 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -528,15 +528,23 @@ StgStreamImpl* StgStreamImpl_Construct(
  */
 #ifdef WORDS_BIGENDIAN

+#ifndef htole32
 #define htole32(x) RtlUlongByteSwap(x)
+#endif
+#ifndef htole16
 #define htole16(x) RtlUshortByteSwap(x)
+#endif
 #define lendian32toh(x) RtlUlongByteSwap(x)
 #define lendian16toh(x) RtlUshortByteSwap(x)

#else

+#ifndef htole32
 #define htole32(x) (x)
+#endif
+#ifndef htole16
 #define htole16(x) (x)
+#endif
 #define lendian32toh(x) (x)
 #define lendian16toh(x) (x)