diff options
| author | brobecke <brobecke@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-04-22 19:34:06 +0000 |
|---|---|---|
| committer | brobecke <brobecke@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-04-22 19:34:06 +0000 |
| commit | 421ea711c0b621982894e858720123de525a017a (patch) | |
| tree | 4459ae0be105a8a08d3ae5c73df9053a640a41b9 | |
| parent | 215cfab253a52574d0cc7bdc7fae82d8d298e053 (diff) | |
| download | gcc-421ea711c0b621982894e858720123de525a017a.tar.gz | |
libiberty/setenv.c: Do not declare environ if defined as a macro.
2015-04-22 Eli Zaretskii <eliz@gnu.org>
* strerror.c <sys_nerr, sys_errlist>: Declare only if they aren't
macros.
* setenv.c <environ>: Declare only if not a macro.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222335 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libiberty/ChangeLog | 4 | ||||
| -rw-r--r-- | libiberty/setenv.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index f02db93f8eb..651f8a9a5f0 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2015-04-22 Eli Zaretskii <eliz@gnu.org> + + * setenv.c <environ>: Declare only if not a macro. + 2015-04-14 Max Ostapenko <m.ostapenko@partner.samsung.com> * testsuite/Makefile.in (LIBCFLAGS): Add LDFLAGS. diff --git a/libiberty/setenv.c b/libiberty/setenv.c index 96917d5769f..714ca0a4076 100644 --- a/libiberty/setenv.c +++ b/libiberty/setenv.c @@ -63,8 +63,10 @@ extern int errno; #define __environ environ #ifndef HAVE_ENVIRON_DECL +#ifndef environ extern char **environ; #endif +#endif #undef setenv #undef unsetenv |