From f1fc25eb747e12a0d4b81144d15e252f039c49ef Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka@google.com>
Date: Wed, 21 Mar 2018 07:50:02 +0000
Subject: Fix declaration of environ after r327923

llvm-svn: 328077
---
 compiler-rt/lib/sanitizer_common/sanitizer_linux.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'compiler-rt/lib')

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
index d652b3f0fc3..fc341a344ef 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
@@ -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>
-- 
cgit v1.2.3