SERVER-41623 Fix building on newer windows Toolkits.

2 files changed, 8 insertions, 6 deletions

diff --git a/src/mongo/base/environment_buffer.cpp b/src/mongo/base/environment_buffer.cpp
index 71186931374..d2396155198 100644
--- a/src/mongo/base/environment_buffer.cpp
+++ b/src/mongo/base/environment_buffer.cpp
@@ -31,10 +31,16 @@
 
 #ifndef _WIN32
 extern char** environ;
+namespace {
+char** environmentPointer = environ;
+}
 #else
-char** const environ = nullptr;
+namespace {
+char** environmentPointer = nullptr;
+}
+
 #endif
 
 char** mongo::getEnvironPointer() {
-    return environ;
+    return environmentPointer;
 }
diff --git a/src/mongo/shell/shell_utils_launcher.cpp b/src/mongo/shell/shell_utils_launcher.cpp
index 5a738a4e213..51b266dc9ed 100644
--- a/src/mongo/shell/shell_utils_launcher.cpp
+++ b/src/mongo/shell/shell_utils_launcher.cpp
@@ -76,10 +76,6 @@
 #include "mongo/util/str.h"
 #include "mongo/util/text.h"
 
-#ifndef _WIN32
-extern char** environ;
-#endif
-
 namespace mongo {
 
 using std::cout;