Adopt commit da342ea from master: Merge pull request #1329 from hrose…

…n4/lean-mean_drqs-106934612 commit da342ea Merge: 1391620 99e4bf5 Author: Henry Verschell <hverschell@bloomberg.net> Date: Wed Sep 27 16:12:21 2017 -0400 Merge pull request #1329 from hrosen4/lean-mean_drqs-106934612 Protect against redefining WIN32_LEAN_AND_MEAN commit 99e4bf5 Author: Hyman Rosen <hrosen4@bloomberg.net> Date: Tue Sep 19 15:32:25 2017 -0400 Protect against redefining WIN32_LEAN_AND_MEAN
bloomberg · Nov 20, 2017 · 8a609dd · 8a609dd
1 parent 0f1077c
commit 8a609dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/groups/bsl/bsls/bsls_bsllock.h b/groups/bsl/bsls/bsls_bsllock.h
@@ -112,7 +112,9 @@ BSLS_IDENT("$Id: $")
 #ifndef INCLUDED_WINDOWS
 // windows.h defaults to include winsock.h unless WIN32_LEAN_AND_MEAN is
 // defined. BDE uses winsocks2.h for its transport facilities.
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #define INCLUDED_WINDOWS
 #endif

diff --git a/groups/bsl/bsls/bsls_dbghelpdllimpl_windows.h b/groups/bsl/bsls/bsls_dbghelpdllimpl_windows.h
@@ -121,7 +121,9 @@ BSLS_IDENT("$Id: $")
 #ifndef INCLUDED_WINDOWS
 // windows.h defaults to include winsock.h unless WIN32_LEAN_AND_MEAN is
 // defined. BDE uses winsocks2.h for its transport facilities.
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #define INCLUDED_WINDOWS
 #endif