Compiler_Warnings: Added patch to fix recently introduced build failure with gcc4.9.

This commit is contained in:
Sebastian Lackner 2015-05-04 19:34:09 +02:00
parent e0390d0bdb
commit 3f7b4894a7
2 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,37 @@
From 1af2d9084b7e2cafea741f021cfc50d6e553c884 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 4 May 2015 19:31:48 +0200
Subject: programs/explorer: Fix build failure with gcc 4.9.
---
programs/explorer/Makefile.in | 2 +-
programs/explorer/explorer.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in
index a06887c1..b43a54e 100644
--- a/programs/explorer/Makefile.in
+++ b/programs/explorer/Makefile.in
@@ -1,6 +1,6 @@
MODULE = explorer.exe
APPMODE = -mwindows -municode
-IMPORTS = rpcrt4 user32 gdi32 advapi32
+IMPORTS = rpcrt4 user32 gdi32 advapi32 uuid
DELAYIMPORTS = comctl32 shell32 oleaut32 ole32 shlwapi
C_SRCS = \
diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c
index 4f82ded..76b8a6c 100644
--- a/programs/explorer/explorer.c
+++ b/programs/explorer/explorer.c
@@ -27,7 +27,6 @@
#include "explorer_private.h"
#include "resource.h"
-#include <initguid.h>
#include <windows.h>
#include <shellapi.h>
#include <shobjidl.h>
--
2.3.7

View File

@ -1504,12 +1504,14 @@ fi
# |
# | Modified files:
# | * dlls/d3d9/tests/visual.c, dlls/netapi32/netapi32.c, dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c,
# | tools/makedep.c
# | programs/explorer/Makefile.in, programs/explorer/explorer.c, tools/makedep.c
# |
if test "$enable_Compiler_Warnings" -eq 1; then
patch_apply Compiler_Warnings/0001-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch
patch_apply Compiler_Warnings/0002-programs-explorer-Fix-build-failure-with-gcc-4.9.patch
(
echo '+ { "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled.", 1 },';
echo '+ { "Sebastian Lackner", "programs/explorer: Fix build failure with gcc 4.9.", 1 },';
) >> "$patchlist"
fi