From b796d5cd1fce0e8d0475dd93d816fe9aacb0979b Mon Sep 17 00:00:00 2001
From: ferdymercury <ferdymercury@users.noreply.github.com>
Date: Wed, 10 Sep 2025 19:08:52 +0200
Subject: [PATCH] Simplify getenv call using cstdlib

---
 lib/CppInterOp/Compatibility.h           | 11 -----------
 lib/CppInterOp/DynamicLibraryManager.cpp |  4 ++--
 lib/CppInterOp/Paths.cpp                 |  1 -
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/lib/CppInterOp/Compatibility.h b/lib/CppInterOp/Compatibility.h
index 24c822dec..f8f22cbe2 100644
--- a/lib/CppInterOp/Compatibility.h
+++ b/lib/CppInterOp/Compatibility.h
@@ -20,17 +20,6 @@
 #define fileno _fileno
 #endif
 
-static inline char* GetEnv(const char* Var_Name) {
-#ifdef _MSC_VER
-  char* Env = nullptr;
-  size_t sz = 0;
-  getenv_s(&sz, Env, sz, Var_Name);
-  return Env;
-#else
-  return getenv(Var_Name);
-#endif
-}
-
 #if CLANG_VERSION_MAJOR < 19
 #define Template_Deduction_Result Sema::TemplateDeductionResult
 #define Template_Deduction_Result_Success                                      \
diff --git a/lib/CppInterOp/DynamicLibraryManager.cpp b/lib/CppInterOp/DynamicLibraryManager.cpp
index df579aa2c..7dfe9873f 100644
--- a/lib/CppInterOp/DynamicLibraryManager.cpp
+++ b/lib/CppInterOp/DynamicLibraryManager.cpp
@@ -8,7 +8,6 @@
 //------------------------------------------------------------------------------
 
 #include "DynamicLibraryManager.h"
-#include "Compatibility.h"
 #include "Paths.h"
 
 #include "llvm/ADT/StringSet.h"
@@ -23,6 +22,7 @@
 #include "llvm/Support/Endian.h"
 #endif
 
+#include <cstdlib>
 #include <fstream>
 #include <sys/stat.h>
 #include <system_error>
@@ -53,7 +53,7 @@ DynamicLibraryManager::DynamicLibraryManager() {
   // Behaviour is to not add paths that don't exist...In an interpreted env
   // does this make sense? Path could pop into existence at any time.
   for (const char* Var : kSysLibraryEnv) {
-    if (const char* Env = GetEnv(Var)) {
+    if (const char* Env = std::getenv(Var)) {
       SmallVector<StringRef, 10> CurPaths;
       SplitPaths(Env, CurPaths, utils::kPruneNonExistent,
                  Cpp::utils::platform::kEnvDelim);
diff --git a/lib/CppInterOp/Paths.cpp b/lib/CppInterOp/Paths.cpp
index 424d5f909..883b79222 100644
--- a/lib/CppInterOp/Paths.cpp
+++ b/lib/CppInterOp/Paths.cpp
@@ -8,7 +8,6 @@
 //------------------------------------------------------------------------------
 
 #include "Paths.h"
-#include "Compatibility.h"
 
 #include "clang/Basic/FileManager.h"
 #include "clang/Lex/HeaderSearchOptions.h"