From 079da46f96122edd76b4d47a535d91a729ff0736 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 14 Apr 2017 16:02:12 +0200 Subject: [PATCH] Added patch to fix compilation with recent versions of gcc. --- ...pilation-with-recent-versions-of-gcc.patch | 32 +++++++++++++++++++ patches/patchinstall.sh | 8 +++-- 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 patches/Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch 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 new file mode 100644 index 00000000..c78a3b53 --- /dev/null +++ b/patches/Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch @@ -0,0 +1,32 @@ +From bb80e69015a8e69294ebf10ee0f785480df52f4b 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(-) + +diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h +index 4fcfd9c362..feaa093e82 100644 +--- a/dlls/ole32/storage32.h ++++ b/dlls/ole32/storage32.h +@@ -528,15 +528,11 @@ StgStreamImpl* StgStreamImpl_Construct( + */ + #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) + +-- +2.12.2 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 79f9fdf2..60c335d0 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2555,11 +2555,12 @@ fi # | Modified files: # | * dlls/amstream/mediastreamfilter.c, dlls/d2d1/brush.c, dlls/d2d1/geometry.c, dlls/d3d11/view.c, dlls/d3d8/texture.c, # | dlls/d3d9/tests/visual.c, dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dsound/primary.c, dlls/dwrite/font.c, -# | dlls/dwrite/layout.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, -# | dlls/vbscript/vbdisp.c, dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, include/wine/list.h, -# | include/wine/rbtree.h, include/winnt.h, tools/makedep.c +# | dlls/dwrite/layout.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, dlls/ole32/storage32.h, dlls/oleaut32/oleaut.c, +# | dlls/rpcrt4/cstub.c, dlls/vbscript/vbdisp.c, dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, +# | include/wine/list.h, include/wine/rbtree.h, include/winnt.h, tools/makedep.c # | if test "$enable_Compiler_Warnings" -eq 1; then + patch_apply Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch patch_apply Compiler_Warnings/0018-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch patch_apply Compiler_Warnings/0019-dsound-Avoid-implicit-cast-of-interface-pointer.patch patch_apply Compiler_Warnings/0020-amstream-Avoid-implicit-cast-of-interface-pointer.patch @@ -2575,6 +2576,7 @@ if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0030-vbscript-Avoid-implicit-cast-of-interface-pointer.patch patch_apply Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch ( + printf '%s\n' '+ { "Sebastian Lackner", "ole32: Fix compilation with recent versions of gcc.", 1 },'; printf '%s\n' '+ { "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "dsound: Avoid implicit cast of interface pointer.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "amstream: Avoid implicit cast of interface pointer.", 1 },';