From afeff9102c2935139de4efd40fd2286dce396706 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Sun, 17 Sep 2017 23:30:37 +0300
Subject: 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>
---
 sal/osl/w32/backtrace.cxx |  3 +++
 sal/osl/w32/dllentry.cxx  | 14 ++++----------
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'sal/osl/w32')

diff --git a/sal/osl/w32/backtrace.cxx b/sal/osl/w32/backtrace.cxx
index 574e4a450f48..b8866322e940 100644
--- a/sal/osl/w32/backtrace.cxx
+++ b/sal/osl/w32/backtrace.cxx
@@ -12,6 +12,9 @@
 #include <limits>
 #include <memory>
 
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include <process.h>
 #include <iostream>
diff --git a/sal/osl/w32/dllentry.cxx b/sal/osl/w32/dllentry.cxx
index 0bce302e935a..bc575ac5b7d8 100644
--- a/sal/osl/w32/dllentry.cxx
+++ b/sal/osl/w32/dllentry.cxx
@@ -17,19 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifdef _MSC_VER
-#pragma warning(push,1) /* disable warnings within system headers */
-#endif
-#include <windows.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
+#include <systools/win32/uwinapi.h>
+#include <tlhelp32.h>
+#include <rpc.h>
+#include <winsock.h>
 #ifdef _DEBUG
 #include <crtdbg.h>
 #endif
-#endif
-#include <tlhelp32.h>
-#include <systools/win32/uwinapi.h>
-#include <winsock.h>
 #include <osl/diagnose.h>
 #include <sal/types.h>
 #include <float.h>
-- 
cgit