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 /desktop | |
parent | Fix chart dump test recent failures on MAC (diff) | |
download | core-aaa26a58ba0f14eab652e0ba7f8d8e66fa479582.tar.gz core-aaa26a58ba0f14eab652e0ba7f8d8e66fa479582.zip |
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 'desktop')
-rw-r--r-- | desktop/source/app/cmdlinehelp.cxx | 3 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 3 | ||||
-rw-r--r-- | desktop/source/deployment/misc/lockfile.cxx | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index 97ff3bcf3c60..a4b3114cf3bb 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -27,6 +27,9 @@ #include "cmdlinehelp.hxx" #ifdef _WIN32 +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include "windows.h" #include "io.h" #include "fcntl.h" diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index d6b620e1e69b..05f4dade58a0 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -85,6 +85,9 @@ #pragma warning (push, 1) #pragma warning (disable: 4005) #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/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx index 47aa5fb72d2c..11530d0be892 100644 --- a/desktop/source/deployment/misc/lockfile.cxx +++ b/desktop/source/deployment/misc/lockfile.cxx @@ -26,6 +26,9 @@ #ifndef _WIN32 #include <unistd.h> #else +#if !defined WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #endif #include <comphelper/random.hxx> |