summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2017-09-17 23:30:37 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2017-09-18 01:13:30 +0200
commitafeff9102c2935139de4efd40fd2286dce396706 (patch)
tree6eddd462cb8d14f3a40f63d1fa4c4f7ed8d4bd2a /vcl
parent164f6ba4e2501ef87639aa4d07699bbf58bdaac0 (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 'vcl')
-rw-r--r--vcl/opengl/win/WinDeviceInfo.cxx4
-rw-r--r--vcl/win/window/keynames.cxx3
-rw-r--r--vcl/win/window/salframe.cxx3
3 files changed, 10 insertions, 0 deletions
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index cb9f1d2943e6..2ec963491327 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -12,7 +12,11 @@
#include "opengl/win/blocklist_parser.hxx"
#include <config_folders.h>
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
#include <windows.h>
+#include <objbase.h>
#include <setupapi.h>
#include <algorithm>
#include <cstdint>
diff --git a/vcl/win/window/keynames.cxx b/vcl/win/window/keynames.cxx
index c6c41001c07e..6ca192ba7d5c 100644
--- a/vcl/win/window/keynames.cxx
+++ b/vcl/win/window/keynames.cxx
@@ -23,6 +23,9 @@
#include <win/salframe.h>
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
#include <windows.h>
// Use unique ;) names to avoid clashes with the KEY_* (especially
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 4bcb1d6e09da..e2c444a3e182 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -88,6 +88,9 @@
#include <time.h>
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
#include <windows.h>
#include <shobjidl.h>
#include <propkey.h>