Cleanup of "extern char **environ" declaration

llvm-svn: 327904

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
index 131f2b775e2c0c40ed21929fe07c060d5b9ebefa..dc616d79657ff099236d2c084bd2ef8ed0927c3f 100644 (file)
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
@@ -85,13 +85,11 @@ extern "C" {
 #include <sys/umtx.h>
 }
 #include <sys/thr.h>
-extern char **environ;  // provided by crt1
 #endif  // SANITIZER_FREEBSD
 
 #if SANITIZER_NETBSD
 #include <limits.h>  // For NAME_MAX
 #include <sys/sysctl.h>
-extern char **environ;  // provided by crt1
 #include <sys/exec.h>
 extern struct ps_strings *__ps_strings;
 #endif  // SANITIZER_NETBSD
@@ -99,15 +97,17 @@ extern struct ps_strings *__ps_strings;
 #if SANITIZER_SOLARIS
 #include <stdlib.h>
 #include <thread.h>
-
-extern char **_environ;
-#define environ _environ
 #endif
 
 #if !SANITIZER_ANDROID
 #include <sys/signal.h>
 #endif
 
+#if SANITIZER_SOLARIS
+#define environ _environ
+#endif
+extern char **_environ;
+
 #if SANITIZER_LINUX
 // <linux/time.h>
 struct kernel_timeval {