From 2b4120187b0e6c2b55300ce6164d28cfab96fc90 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 19 Apr 2017 04:04:24 +0200 Subject: [PATCH] Compiler_Warnings: Fix compililation error on OSX. --- ...pilation-with-recent-versions-of-gcc.patch | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/patches/Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch b/patches/Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch index c78a3b53..408d8f75 100644 --- a/patches/Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch +++ b/patches/Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch @@ -1,32 +1,26 @@ -From bb80e69015a8e69294ebf10ee0f785480df52f4b Mon Sep 17 00:00:00 2001 +From 43628d9b1905396ff6442e4f1e07c9dd48739b19 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 14 Apr 2017 15:57:18 +0200 Subject: ole32: Fix compilation with recent versions of gcc. --- - dlls/ole32/storage32.h | 4 ---- - 1 file changed, 4 deletions(-) + dlls/ole32/storage32.h | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h -index 4fcfd9c362..feaa093e82 100644 +index 4fcfd9c362..2b23ab8eb8 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h -@@ -528,15 +528,11 @@ StgStreamImpl* StgStreamImpl_Construct( +@@ -526,6 +526,9 @@ StgStreamImpl* StgStreamImpl_Construct( + /****************************************************************************** + * Endian conversion macros */ ++#undef htole32 ++#undef htole16 ++ #ifdef WORDS_BIGENDIAN --#define htole32(x) RtlUlongByteSwap(x) --#define htole16(x) RtlUshortByteSwap(x) - #define lendian32toh(x) RtlUlongByteSwap(x) - #define lendian16toh(x) RtlUshortByteSwap(x) - - #else - --#define htole32(x) (x) --#define htole16(x) (x) - #define lendian32toh(x) (x) - #define lendian16toh(x) (x) - + #define htole32(x) RtlUlongByteSwap(x) -- 2.12.2