From e55eb806dbb97f53794b0c2f86983d34f6696845 Mon Sep 17 00:00:00 2001 From: Michael Roth Date: Wed, 24 Feb 2016 18:14:52 -0600 Subject: qga: fix w32 breakage due to missing osdep.h includes requester.h relied on qemu/compiler.h definitions to handle GCC_FMT_ATTR() stub, but this include was removed as part of scripted clean-ups via 30456d5: all: Clean up includes under the assumption that all C files would have included it via qemu/osdep.h at that point. requester.cpp was likely missed due to C++ files requiring manual/special handling as well as VSS build options needing to be enabled to trigger build failures. Fix this by including qemu/osdep.h. That in turn pulls in a macro from qapi/error.h that conflicts with a struct field name in requester.h, so fix that as well by renaming the field. While we're at it, fix up provider.cpp/install.cpp to include osdep.h as well. Cc: Peter Maydell Signed-off-by: Michael Roth Reviewed-by: Eric Blake --- qga/vss-win32/install.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qga/vss-win32/install.cpp') diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index b0e4426c72..cd9cdb4a24 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -10,8 +10,7 @@ * See the COPYING file in the top-level directory. */ -#include -#include +#include "qemu/osdep.h" #include "vss-common.h" #include "inc/win2003/vscoordint.h" -- cgit 1.4.1