diff options
| -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 1ec91cdc264..c1fdb8ea65d 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2017-05-31 Eli Zaretskii <eliz@gnu.org> + + * environ.h: Add #ifndef guard. + 2017-05-30 Anton Kolesov <anton.kolesov@synopsys.com> * elf/arc-cpu.def: New file. 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 |