From aaa26a58ba0f14eab652e0ba7f8d8e66fa479582 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Mon, 18 Sep 2017 17:34:28 +0300
Subject: 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>
---
 sal/cppunittester/cppunittester.cxx         | 3 +++
 sal/osl/w32/file_url.hxx                    | 4 +++-
 sal/qa/osl/file/osl_File.cxx                | 3 +++
 sal/qa/osl/process/osl_Thread.cxx           | 3 +++
 sal/qa/osl/process/osl_process.cxx          | 3 +++
 sal/qa/osl/security/osl_Security.cxx        | 3 +++
 sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 3 +++
 sal/qa/rtl/uuid/rtl_Uuid.cxx                | 3 +++
 8 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'sal')

diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 7b321643a37a..79697bade9dc 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -18,6 +18,9 @@
  */
 
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #endif
 
diff --git a/sal/osl/w32/file_url.hxx b/sal/osl/w32/file_url.hxx
index c8eec0632d22..43bed9100bdb 100644
--- a/sal/osl/w32/file_url.hxx
+++ b/sal/osl/w32/file_url.hxx
@@ -29,7 +29,9 @@
 #pragma warning(push,1)
 #endif
 
-#define WINDOWS_LEAN_AND_MEAN
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 
 #ifdef _MSC_VER
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 4a3b014b095c..d3aaf7e2fdef 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -32,6 +32,9 @@
 #include <memory>
 
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #endif
 
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index 8248255ba78b..c6c016afb7e4 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -19,6 +19,9 @@
 
 #include <algorithm>
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #else
 #include <unistd.h>
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 917fca1a89f2..06709c9c6677 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -44,6 +44,9 @@
 #endif
 
 #if defined(_WIN32)                     // Windows
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #   include <windows.h>
 #   include <tchar.h>
 #else
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 1595377ac25d..c1268b256bc6 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -19,6 +19,9 @@
 
 #include <algorithm>
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #undef min
 #endif
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index c8173831f757..f882b104c9bc 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -34,6 +34,9 @@
 #include <cppunit/plugin/TestPlugIn.h>
 
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #else
 #include <unistd.h>
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index 21d5ca65fb4b..b77e84afe2ff 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -29,6 +29,9 @@
 #include <cppunit/plugin/TestPlugIn.h>
 
 #ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #elif defined UNX
 #include <unistd.h>
-- 
cgit