diff options
| author | DJ Delorie <dj@redhat.com> | 2006-06-02 15:37:03 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2006-06-02 15:37:03 +0000 |
| commit | 7741be99dddd09a13a58229705190e53ecf5ffc1 (patch) | |
| tree | f6c263f3fd48a6a630e61866af221cf95c9bfa11 /libiberty | |
| parent | 351ff01ac526af94e6e159e9bc4be6411d11f4ea (diff) | |
| download | gdb-7741be99dddd09a13a58229705190e53ecf5ffc1.zip gdb-7741be99dddd09a13a58229705190e53ecf5ffc1.tar.gz gdb-7741be99dddd09a13a58229705190e53ecf5ffc1.tar.bz2 | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/pex-unix.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index e2899c0..93f8449 100644 --- 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. diff --git a/libiberty/pex-unix.c b/libiberty/pex-unix.c index 91619af..e006e59 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) { |