This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] libiberty/setenv.c: Do not declare environ if defined as a macro.
- From: Joel Brobecker <brobecke at sourceware dot org>
- To: bfd-cvs at sourceware dot org, gdb-cvs at sourceware dot org
- Date: 22 Apr 2015 19:38:02 -0000
- Subject: [binutils-gdb] libiberty/setenv.c: Do not declare environ if defined as a macro.
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=dfc0f57b741c12a94520c9ec7f726755eac1d2de
commit dfc0f57b741c12a94520c9ec7f726755eac1d2de
Author: Joel Brobecker <brobecker@adacore.com>
Date: Wed Apr 22 12:35:54 2015 -0700
libiberty/setenv.c: Do not declare environ if defined as a macro.
Otherwise, it causes a build warning on some platforms such as MinGW.
libiberty/ChangeLog (Eli Zaretskii <eliz@gnu.org>):
* setenv.c <environ>: Declare only if not a macro.
Diff:
---
libiberty/ChangeLog | 4 ++++
libiberty/setenv.c | 2 ++
2 files changed, 6 insertions(+)
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 22e3f85..5009807 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-01-19 Eli Zaretskii <eliz@gnu.org>
* strerror.c <sys_nerr, sys_errlist>: Declare only if they aren't
diff --git a/libiberty/setenv.c b/libiberty/setenv.c
index 96917d5..714ca0a 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