merge from gcc

2006-06-02 15:37:03 +00:00 · 2006-06-02 15:37:03 +00:00 · 7741be99dd
parent 351ff01ac5
commit 7741be99dd
2 changed files with 6 additions and 1 deletions
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@ -1,3 +1,8 @@
+2006-06-02  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* pex-unix.c (pex_unix_exec_child): Insert cast when assigning
+	to environ.
+
 2006-06-01  Mark Shinwell  <shinwell@codesourcery.com>

 	* pex-common.c: New function pex_run_in_environment.
--- a/libiberty/pex-unix.c
+++ b/libiberty/pex-unix.c
@ -415,7 +415,7 @@ pex_unix_exec_child (struct pex_obj *obj, int flags, const char *executable,
 	}

      if (env)
-        environ = env;
+        environ = (char**) env;

      if ((flags & PEX_SEARCH) != 0)
 	{