From 268adf2a03cf352593b632c5249c83f4fc56956f Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Wed, 24 Apr 2013 17:50:30 +0000 Subject: Don't forward declare environ on Windows That seems to interact poorly with the environ and _environ macros defined in MSVC's . Also remove the incorrect comment about _NSGetEnviron(). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@180200 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Support/ProgramTest.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'unittests') diff --git a/unittests/Support/ProgramTest.cpp b/unittests/Support/ProgramTest.cpp index 80b0334c67..279e2e8d0f 100755 --- a/unittests/Support/ProgramTest.cpp +++ b/unittests/Support/ProgramTest.cpp @@ -13,9 +13,9 @@ #include "gtest/gtest.h" #include -#ifdef __APPLE__ +#if defined(__APPLE__) # include -#else +#elif !defined(_MSC_VER) // Forward declare environ in case it's not provided by stdlib.h. extern char **environ; #endif @@ -32,8 +32,6 @@ ProgramTestStringArg2("program-test-string-arg2"); static void CopyEnvironment(std::vector &out) { #ifdef __APPLE__ - // _NSGetEnviron() only works from the main exe on Mac. Fortunately the test - // should be in the executable. char **envp = *_NSGetEnviron(); #else // environ seems to work for Windows and most other Unices. -- cgit v1.2.3