diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-17 23:30:37 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-18 01:13:30 +0200 |
| commit | afeff9102c2935139de4efd40fd2286dce396706 (patch) | |
| tree | 6eddd462cb8d14f3a40f63d1fa4c4f7ed8d4bd2a /shell | |
| parent | 164f6ba4e2501ef87639aa4d07699bbf58bdaac0 (diff) | |
Use even more WIN32_LEAN_AND_MEAN
Change-Id: I538fe5b41156366e0e87b3a93e58a3947afd18f5
Reviewed-on: https://gerrit.libreoffice.org/42398
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'shell')
10 files changed, 28 insertions, 0 deletions
diff --git a/shell/inc/spsupp/registrar.hpp b/shell/inc/spsupp/registrar.hpp index 21f0c22d9688..a2a2db49616a 100644 --- a/shell/inc/spsupp/registrar.hpp +++ b/shell/inc/spsupp/registrar.hpp @@ -10,6 +10,9 @@ #ifndef INCLUDED_SHELL_INC_SPSUPP_REGISTRAR_H #define INCLUDED_SHELL_INC_SPSUPP_REGISTRAR_H +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include "windows.h" class Registrar { diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index d51571071ab4..ff9b81b406b6 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -34,6 +34,9 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #if defined _MSC_VER #pragma warning(pop) diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index d6af801ad9b0..9f4f2d8f9556 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -25,6 +25,9 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #include <wininet.h> #include <sal/alloca.h> diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index f312c8927de8..c1df310962cc 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -48,6 +48,9 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #if defined _MSC_VER #pragma warning(pop) diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx index 1defe9644852..88a194e9a603 100644 --- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx @@ -29,6 +29,9 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #include <filter.h> #if defined _MSC_VER diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx index 963493c0a49c..bd771407fedf 100644 --- a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx +++ b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx @@ -27,6 +27,9 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #include <ole2.h> #include <ntquery.h> diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx index b53c56410c3f..5d8e67c58b0f 100644 --- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx @@ -21,6 +21,9 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #if defined _MSC_VER #pragma warning(pop) diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx index 300c269c7e4d..1555c1fec3ed 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx @@ -23,6 +23,9 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #if defined _MSC_VER #pragma warning(pop) diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx index 9a6480962aa8..9c76be19cab2 100644 --- a/shell/source/win32/shlxthandler/util/registry.cxx +++ b/shell/source/win32/shlxthandler/util/registry.cxx @@ -21,6 +21,9 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #if defined _MSC_VER #pragma warning(pop) diff --git a/shell/source/win32/spsupp/registrar.cxx b/shell/source/win32/spsupp/registrar.cxx index 5d49efe7c88c..9a5718dcd884 100644 --- a/shell/source/win32/spsupp/registrar.cxx +++ b/shell/source/win32/spsupp/registrar.cxx @@ -9,6 +9,7 @@ #include "registrar.hpp" #include "wchar.h" +#include "objbase.h" namespace { |