diff options
| author | DJ Delorie <dj@delorie.com> | 2006-06-02 15:37:03 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2006-06-02 15:37:03 +0000 |
| commit | 17c107cb5ae4fff2a185d399dbc1f296fb7518ef (patch) | |
| tree | 9eb2f1de0b0377563486590301510bce18e0bfc0 /libiberty | |
| parent | 514d7f787f07cb21066b7cfb927d13c1bd53d410 (diff) | |
| download | gdb-17c107cb5ae4fff2a185d399dbc1f296fb7518ef.tar.gz | |
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 e2899c0ae09..93f8449f65b 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 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) { |