[compiler-rt] r328077 - Fix declaration of environ after r327923

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Wed Mar 21 00:50:02 2018
New Revision: 328077

URL: http://llvm.org/viewvc/llvm-project?rev=328077&view=rev
Log:
Fix declaration of environ after r327923

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=328077&r1=328076&r2=328077&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc Wed Mar 21 00:50:02 2018
@@ -102,16 +102,14 @@ extern struct ps_strings *__ps_strings;
 #if SANITIZER_SOLARIS
 #include <stdlib.h>
 #include <thread.h>
+#define environ _environ
 #endif
 
 #if !SANITIZER_ANDROID
 #include <sys/signal.h>
 #endif
 
-#if SANITIZER_SOLARIS
-#define environ _environ
-#endif
-extern char **_environ;
+extern char **environ;
 
 #if SANITIZER_LINUX
 // <linux/time.h>