From 7741be99dddd09a13a58229705190e53ecf5ffc1 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 2 Jun 2006 15:37:03 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 5 +++++ libiberty/pex-unix.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index e2899c0ae09..93f8449f65b 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2006-06-02 Mark Shinwell + + * pex-unix.c (pex_unix_exec_child): Insert cast when assigning + to environ. + 2006-06-01 Mark Shinwell * pex-common.c: New function pex_run_in_environment. diff --git a/libiberty/pex-unix.c b/libiberty/pex-unix.c index 91619af1e2c..e006e599297 100644 --- 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) { -- 2.30.2