diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2002-07-19 20:36:09 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2002-07-19 20:36:09 +0000 |
| commit | 9b022d6db80564cfc10c7f18e5d05cedb32f6375 (patch) | |
| tree | 5daa6fff0a936f4aef743f3a438670468931922f /newlib/libc/argz/envz_merge.c | |
| parent | d477c5225dbca4290e41a2b2de989a4845500c19 (diff) | |
| download | cygnal-9b022d6db80564cfc10c7f18e5d05cedb32f6375.tar.gz cygnal-9b022d6db80564cfc10c7f18e5d05cedb32f6375.tar.bz2 cygnal-9b022d6db80564cfc10c7f18e5d05cedb32f6375.zip | |
* libc/argz/argz_replace.c: Include buf_findstr.h.
* libc/argz/buf_findstr.c: Likewise.
* libc/argz/envz_entry.c: Include buf_findstr.h. Cast return
value to (char *).
* libc/argz/envz_get.c: Likewise.
* libc/include/sys/unistd.h: Add getopt and getsubopt declarations.
* libc/stdlib/Makefile.am (LIB_SOURCES): Add getsubopt.c.
* libc/stdlib/getsubopt.3: New file.
* libc/stdlib/getsubopt.c: New file.
* libc/sys/linux/machine/i386/socketcall.h (__sockcall_base):
Change esp to ebp.
Diffstat (limited to 'newlib/libc/argz/envz_merge.c')
| -rw-r--r-- | newlib/libc/argz/envz_merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/newlib/libc/argz/envz_merge.c b/newlib/libc/argz/envz_merge.c index b01733017..da2d8cb08 100644 --- a/newlib/libc/argz/envz_merge.c +++ b/newlib/libc/argz/envz_merge.c @@ -20,7 +20,7 @@ envz_merge (char **envz, size_t *envz_len, const char *envz2, size_t envz2_len, char *name_iter = NULL; int retval = 0; - while((entry = argz_next(envz2, envz2_len, entry)) && !retval) + while((entry = argz_next((char *)envz2, envz2_len, entry)) && !retval) { if (!override) { |