diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-01-31 23:47:37 +0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-02-21 10:35:53 +0100 |
| commit | 61fb0bd1f6eaec5f9715031df79c7bbba72acbd9 (patch) | |
| tree | cf27930726d6aa53643a0021f9ed7e8cebfb31aa | |
| parent | 1dbb74e86f15116a72996bf9614baf29a0a43b57 (diff) | |
| download | qemu-61fb0bd1f6eaec5f9715031df79c7bbba72acbd9.zip qemu-61fb0bd1f6eaec5f9715031df79c7bbba72acbd9.tar.gz qemu-61fb0bd1f6eaec5f9715031df79c7bbba72acbd9.tar.bz2 | |
qga/vss: use standard windows headers location
Stop using special paths with outdated headers from an old SDK.
Instead, use standard include paths.
You can still build against the old SDK by running configure with
--extra-cxxflags="-isystem /path/to/inc/win2003/"
(this also allows to build against MinGW headers, which are currently
broken as in 9.0)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | qga/vss-win32/install.cpp | 2 | ||||
| -rw-r--r-- | qga/vss-win32/provider.cpp | 4 | ||||
| -rw-r--r-- | qga/vss-win32/requester.cpp | 4 | ||||
| -rw-r--r-- | qga/vss-win32/vss-common.h | 6 |
4 files changed, 6 insertions, 10 deletions
diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index 40de133..efc5bb9 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "vss-common.h" -#include <inc/win2003/vscoordint.h> +#include <vscoordint.h> #include "install.h" #include <wbemidl.h> #include <comdef.h> diff --git a/qga/vss-win32/provider.cpp b/qga/vss-win32/provider.cpp index 72d8b0e..fd187fb 100644 --- a/qga/vss-win32/provider.cpp +++ b/qga/vss-win32/provider.cpp @@ -12,8 +12,8 @@ #include "qemu/osdep.h" #include "vss-common.h" -#include <inc/win2003/vscoordint.h> -#include <inc/win2003/vsprov.h> +#include <vscoordint.h> +#include <vsprov.h> #define VSS_TIMEOUT_MSEC (60*1000) diff --git a/qga/vss-win32/requester.cpp b/qga/vss-win32/requester.cpp index 940a2c8..4513324 100644 --- a/qga/vss-win32/requester.cpp +++ b/qga/vss-win32/requester.cpp @@ -14,8 +14,8 @@ #include "vss-common.h" #include "requester.h" #include "install.h" -#include <inc/win2003/vswriter.h> -#include <inc/win2003/vsbackup.h> +#include <vswriter.h> +#include <vsbackup.h> /* Max wait time for frozen event (VSS can only hold writes for 10 seconds) */ #define VSS_TIMEOUT_FREEZE_MSEC 60000 diff --git a/qga/vss-win32/vss-common.h b/qga/vss-win32/vss-common.h index 61c170b..54f8de8 100644 --- a/qga/vss-win32/vss-common.h +++ b/qga/vss-win32/vss-common.h @@ -46,11 +46,7 @@ #undef VSS_E_MAXIMUM_NUMBER_OF_VOLUMES_REACHED #undef VSS_E_MAXIMUM_NUMBER_OF_SNAPSHOTS_REACHED -/* - * VSS headers must be installed from Microsoft VSS SDK 7.2 available at: - * http://www.microsoft.com/en-us/download/details.aspx?id=23490 - */ -#include <inc/win2003/vss.h> +#include <vss.h> #include "vss-handles.h" /* Macros to convert char definitions to wchar */ |