wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Compiler_Warnings: Fix compililation error on OSX.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-04-19 04:04:24 +02:00
parent 5dcd52a67f
commit 2b4120187b
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
patches/Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch
View File

@ -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 <sebastian@fds-team.de>
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