diff options
| author | dj <dj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-05-20 01:22:07 +0000 |
|---|---|---|
| committer | dj <dj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-05-20 01:22:07 +0000 |
| commit | 9d5e3111a5abbbbedcec1ca97ebfbb43093e8bca (patch) | |
| tree | 6c90324f32f3a48a68965fa308236860415f2518 /include | |
| parent | 96f59f5ab41fe7c2637139963bebecf09ea5a977 (diff) | |
| download | gcc-9d5e3111a5abbbbedcec1ca97ebfbb43093e8bca.tar.gz | |
2017-05-19 Eli Zaretskii <eliz@gnu.org>
* environ.h: Add #ifndef guard.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@248308 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/environ.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 9b7a139bc26..52903816ac0 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2017-05-19 Eli Zaretskii <eliz@gnu.org> + + * environ.h: Add #ifndef guard. + 2017-05-18 Martin Liska <mliska@suse.cz> * ansidecl.h: Define CONSTEXPR macro. diff --git a/include/environ.h b/include/environ.h index 326a27812db..32bb0b155c9 100644 --- a/include/environ.h +++ b/include/environ.h @@ -27,7 +27,9 @@ Boston, MA 02110-1301, USA. */ # include <crt_externs.h> # define environ (*_NSGetEnviron ()) # else +# ifndef environ extern char **environ; +# endif # endif # define HAVE_ENVIRON_DECL #endif |