summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2017-09-15 19:45:21 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2017-09-16 20:16:15 +0200
commit3128668599744b4fd63c9eebbeb3e9e4533b66df (patch)
treed188de71faf111f1c8490c29226b1713a6d1677f /shell
parent8508e409a2cc1d38a347204d90f29cac153e8015 (diff)
Use more WIN32_LEAN_AND_MEAN
https://msdn.microsoft.com/en-us/aa383745 Change-Id: I83528dc8e6a5e119e7aa816219d35f1ea3723b96 Reviewed-on: https://gerrit.libreoffice.org/42338 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/inc/global.hxx3
-rw-r--r--shell/inc/utilities.hxx3
-rw-r--r--shell/source/tools/regsvrex/regsvrex.cxx1
3 files changed, 7 insertions, 0 deletions
diff --git a/shell/inc/global.hxx b/shell/inc/global.hxx
index 59696523a740..24dd2e0d664c 100644
--- a/shell/inc/global.hxx
+++ b/shell/inc/global.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/inc/utilities.hxx b/shell/inc/utilities.hxx
index 9d772ec9872a..d72f6b66fdd9 100644
--- a/shell/inc/utilities.hxx
+++ b/shell/inc/utilities.hxx
@@ -24,6 +24,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/tools/regsvrex/regsvrex.cxx b/shell/source/tools/regsvrex/regsvrex.cxx
index c4f2e053ded6..0add6ae1788e 100644
--- a/shell/source/tools/regsvrex/regsvrex.cxx
+++ b/shell/source/tools/regsvrex/regsvrex.cxx
@@ -21,6 +21,7 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#if defined _MSC_VER
#pragma warning(pop)