[PATCH] ole32: Don't redefine htole32/htole16
Fabian Maurer
dark.shadow4 at web.de
Sat Oct 7 11:14:53 CDT 2017
On some systems these macros are already defined
in usr/include/endian.h
Signed-off-by: Fabian Maurer <dark.shadow4 at web.de>
---
dlls/ole32/storage32.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index 4fcfd9c362..c628523d09 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)
--
2.14.2
More information about the wine-patches
mailing list