diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-18 17:34:28 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-18 19:24:31 +0200 |
| commit | aaa26a58ba0f14eab652e0ba7f8d8e66fa479582 (patch) | |
| tree | 34299e87165aa7cc6c38c357b7e4deddaef76816 /cli_ure | |
| parent | 3c1f44c91091205512098bb4f1d56333c20a1f8b (diff) | |
Some more WIN32_LEAN_AND_MEAN
Change-Id: Iadb0ebb66809c192fb817b8c7cf2f8cdb4d0b874
Reviewed-on: https://gerrit.libreoffice.org/42419
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/source/native/native_bootstrap.cxx | 3 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_bridge.cxx | 3 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_data.cxx | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/cli_ure/source/native/native_bootstrap.cxx b/cli_ure/source/native/native_bootstrap.cxx index 2ff980fa776f..19b83fa4eb91 100644 --- a/cli_ure/source/native/native_bootstrap.cxx +++ b/cli_ure/source/native/native_bootstrap.cxx @@ -24,6 +24,9 @@ #ifdef _MSC_VER #pragma warning(push, 1) #endif +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #ifdef _MSC_VER #pragma warning(pop) diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 615941b3f36a..93e51058a170 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -20,6 +20,9 @@ #include <vcclr.h> //ToDo: remove when build with .NET 2 #pragma warning(push, 1) +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #include "uno/environment.hxx" #pragma warning(pop) diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index c7c027691a08..e51c833714ae 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -18,7 +18,11 @@ */ #pragma warning(push, 1) +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include "windows.h" +#include <ole2.h> #pragma warning(pop) #include <memory> |