From 9b022d6db80564cfc10c7f18e5d05cedb32f6375 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Fri, 19 Jul 2002 20:36:09 +0000 Subject: * 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. --- newlib/libc/argz/envz_merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'newlib/libc/argz/envz_merge.c') 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) { -- cgit v1.2.3