diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2018-03-19 20:44:06 +0000 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2018-03-19 20:44:06 +0000 |
| commit | edeeb58f2aac474f6368cb78167d824d083991fb (patch) | |
| tree | 6ad84a50d0d35ff36ad98fa79fc4aeb62e129280 /compiler-rt/lib | |
| parent | a21558897bd2d068e997cd6dc3d45af3f280cbb8 (diff) | |
| download | bcm5719-llvm-edeeb58f2aac474f6368cb78167d824d083991fb.tar.gz bcm5719-llvm-edeeb58f2aac474f6368cb78167d824d083991fb.zip | |
Cleanup of "extern char **environ" declaration
llvm-svn: 327904
Diffstat (limited to 'compiler-rt/lib')
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_linux.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc index 131f2b775e2..dc616d79657 100644 --- 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 { |
