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 /fpicker | |
| 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 'fpicker')
5 files changed, 15 insertions, 0 deletions
diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx index 0601affcf320..a1afc6c581eb 100644 --- a/fpicker/source/win32/filepicker/FilterContainer.cxx +++ b/fpicker/source/win32/filepicker/FilterContainer.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> #if defined _MSC_VER #pragma warning(pop) diff --git a/fpicker/source/win32/filepicker/afxres.h b/fpicker/source/win32/filepicker/afxres.h index 61f5ab91ce4c..6b84f154296e 100644 --- a/fpicker/source/win32/filepicker/afxres.h +++ b/fpicker/source/win32/filepicker/afxres.h @@ -1,4 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #include <dlgs.h> diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx index a2e530c76496..63b290a698eb 100644 --- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx +++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx @@ -42,6 +42,9 @@ #include <osl/thread.h> #include <stdio.h> +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #include "..\FPServiceInfo.hxx" diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx index d6d421de018f..3c6e29d336dc 100644 --- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx +++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx @@ -37,6 +37,9 @@ #define _WIN32_DCOM +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx index 2e78cdaed136..9102dbfd4dd3 100644 --- a/fpicker/source/win32/misc/WinImplHelper.hxx +++ b/fpicker/source/win32/misc/WinImplHelper.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> #if defined _MSC_VER #pragma warning(pop) |