diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-01-22 22:16:34 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-01-23 14:04:24 +0100 |
| commit | ba68436e3fea34b4ae696f96f8048502865cdc79 (patch) | |
| tree | 8c6b47e16cab234b38a8ba67c930acced71dced2 | |
| parent | 2830d21964f655c3bbc8cda1f63ce6a3840f6742 (diff) | |
Win SDK 8.1: apparently VersionHelpers.h needs to be included explicitly
http://ci.libreoffice.org/job/lo_gerrit_master/495/Gerrit=Gerrit,Platform=Windows/console
Change-Id: I0104d448906bd17857b3716856c544e632c1662c
7 files changed, 22 insertions, 0 deletions
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index 1d7040ba9c0b..a1f7e44d2c25 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -26,6 +26,9 @@ #include <control.h> #include <uuids.h> #include <evcode.h> +#ifdef _WIN32_WINNT_WINBLUE +#include <VersionHelpers.h> +#endif #if defined _MSC_VER #pragma warning(pop) #endif diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx index 8f470a2dc08c..6e4dcd2a4b9f 100644 --- a/fpicker/source/win32/misc/WinImplHelper.cxx +++ b/fpicker/source/win32/misc/WinImplHelper.cxx @@ -24,6 +24,9 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Sequence.hxx> +#ifdef _WIN32_WINNT_WINBLUE +#include <VersionHelpers.h> +#endif // namespace directives diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx index 5f8b15e83dd2..3a7177085f8f 100644 --- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx +++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx @@ -23,6 +23,9 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <msiquery.h> +#ifdef _WIN32_WINNT_WINBLUE +#include <VersionHelpers.h> +#endif #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx index 824b7fdd16f5..bd136d18031c 100644 --- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx +++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx @@ -29,6 +29,9 @@ #pragma warning(push, 1) #endif #include <shellapi.h> +#ifdef _WIN32_WINNT_WINBLUE +#include <VersionHelpers.h> +#endif #if defined _MSC_VER #pragma warning(pop) #endif diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index 5d57a4fbac53..c3f883d34dee 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -40,6 +40,9 @@ #pragma warning(push, 1) #endif #include <shellapi.h> +#ifdef _WIN32_WINNT_WINBLUE +#include <VersionHelpers.h> +#endif #if defined _MSC_VER #pragma warning(pop) #endif diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx index f97013ef6d38..8712aa252e10 100644 --- a/shell/source/win32/shlxthandler/util/utilities.cxx +++ b/shell/source/win32/shlxthandler/util/utilities.cxx @@ -25,6 +25,9 @@ #include "internal/config.hxx" #include "internal/utilities.hxx" +#ifdef _WIN32_WINNT_WINBLUE +#include <VersionHelpers.h> +#endif // constants diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index fe24ffaa325a..1070c051cded 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -70,6 +70,10 @@ #include <gdipluscolor.h> #include <shlobj.h> +#ifdef _WIN32_WINNT_WINBLUE +#include <VersionHelpers.h> +#endif + #ifdef __MINGW32__ #ifdef GetObject #undef GetObject |