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 /embedserv | |
| 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 'embedserv')
| -rw-r--r-- | embedserv/source/embed/docholder.cxx | 6 | ||||
| -rw-r--r-- | embedserv/source/inc/syswinwrapper.hxx | 3 | ||||
| -rw-r--r-- | embedserv/source/inprocserv/advisesink.hxx | 4 | ||||
| -rw-r--r-- | embedserv/source/inprocserv/inprocembobj.h | 3 |
4 files changed, 15 insertions, 1 deletions
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 14e95f26d45b..2998395279c4 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -25,9 +25,13 @@ #include "intercept.hxx" #include "syswinwrapper.hxx" #include "iipaobj.hxx" - #include "common.h" + +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> + #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/XView.hpp> diff --git a/embedserv/source/inc/syswinwrapper.hxx b/embedserv/source/inc/syswinwrapper.hxx index fde21349095b..f255058bff26 100644 --- a/embedserv/source/inc/syswinwrapper.hxx +++ b/embedserv/source/inc/syswinwrapper.hxx @@ -20,6 +20,9 @@ #ifndef INCLUDED_EMBEDSERV_SOURCE_INC_SYSWINWRAPPER_HXX #define INCLUDED_EMBEDSERV_SOURCE_INC_SYSWINWRAPPER_HXX +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> /** diff --git a/embedserv/source/inprocserv/advisesink.hxx b/embedserv/source/inprocserv/advisesink.hxx index 7edd17cd5100..f19c61c7778d 100644 --- a/embedserv/source/inprocserv/advisesink.hxx +++ b/embedserv/source/inprocserv/advisesink.hxx @@ -24,7 +24,11 @@ #include <memory> +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> +#include <objidl.h> #include "smartpointer.hxx" namespace inprocserv { diff --git a/embedserv/source/inprocserv/inprocembobj.h b/embedserv/source/inprocserv/inprocembobj.h index a900a61598f1..691ef58d4500 100644 --- a/embedserv/source/inprocserv/inprocembobj.h +++ b/embedserv/source/inprocserv/inprocembobj.h @@ -24,6 +24,9 @@ #pragma warning(disable : 4668) #endif +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #include <oleidl.h> |